sublayerapp · swerner · Oct 8, 2024 · Sep 29, 2024 · Sep 29, 2024 · Sep 29, 2024
diff --git a/lib/sublayer/cli.rb b/lib/sublayer/cli.rb
@@ -11,6 +11,9 @@
 require_relative "cli/commands/generator"
 require_relative "cli/commands/agent"
 require_relative "cli/commands/action"
+require_relative "cli/commands/cli_project"
+require_relative "cli/commands/github_action_project"
+require_relative "cli/commands/quick_script_project"
 
 module Sublayer
   class CLI < Thor

diff --git a/lib/sublayer/cli/commands/cli_project.rb b/lib/sublayer/cli/commands/cli_project.rb
@@ -0,0 +1,79 @@
+module Sublayer
+  module Commands
+    class CLIProject < Thor::Group
+      include Thor::Actions
+
+      argument :project_name
+
+      class_option :provider, type: :string, desc: "AI provider (OpenAI, Claude, or Gemini)", aliases: :p
+      class_option :model, type: :string, desc: "AI model name to use (e.g. gpt-4o, claude-3-haiku-20240307, gemini-1.5-flash-latest)", aliases: :m
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def sublayer_version
+        Sublayer::VERSION
+      end
+
+      def ask_for_project_details
+        @ai_provider = options[:provider] || ask("Select an AI provider:", default: "OpenAI", limited_to: %w[OpenAI Claude Gemini])
+        @ai_model = options[:model] || select_ai_model
+      end
+
+      def create_project_directory
+        say "Creating project directory", :green
+
+        empty_directory project_name
+      end
+
+      def copy_template_files
+        say "Copying template files", :green
+
+        directory "../templates/cli", project_name
+      end
+
+      def generate_configuration
+        say "Generating configuration", :green
+
+        config = {
+          project_name: @project_name,
+          project_template: "CLI",
+          ai_provider: @provider,
+          ai_model: @model
+        }
+
+        create_file File.join(project_name, "lib", project_name, "config", "sublayer.yml"), YAML.dump(config)
+      end
+
+      def finalize_project
+        say "Finalizing project", :green
+
+        inside(project_name) do
+          chmod("bin/#{project_name}", "+x")
+          run("git init") if yes?("Initialize a git repository?")
+          run("bundle install") if yes?("Install gems?")
+        end
+      end
+
+      def print_next_steps
+        say "\nSublayer project '#{project_name}' created successfully!", :green
+        say "To get started, run:"
+        say "  cd #{project_name}"
+        say "  ./bin/#{project_name}"
+      end
+
+      private
+      def select_ai_model
+        case @ai_provider
+        when "OpenAI"
+          ask("Which OpenAI model would you like to use?", default: "gpt-4o", limited_to: %w[gpt-4o gpt-4o-mini gpt-4-turbo gpt-3.5-turbo])
+        when "Claude"
+          ask("Which Anthropic model would you like to use?", default: "claude-3-5-sonnet-20240620", limited_to: %w[claude-3-5-sonnet-20240620 claude-3-opus-20240620 claude-3-haiku-20240307])
+        when "Gemini"
+          ask("Which Google model would you like to use?", default: "gemini-1.5-flash-latest", limited_to: %w[gemini-1.5-flash-latest gemini-1.5-pro-latest])
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sublayer/cli/commands/github_action_project.rb b/lib/sublayer/cli/commands/github_action_project.rb
@@ -0,0 +1,70 @@
+module Sublayer
+  module Commands
+    class GithubActionProject < Thor::Group
+      attr_reader :ai_provider_key
+
+      include Thor::Actions
+
+      argument :project_name
+
+      class_option :provider, type: :string, desc: "AI provider (OpenAI, Claude, or Gemini)", aliases: :p
+      class_option :model, type: :string, desc: "AI model name to use (e.g. gpt-4o, claude-3-haiku-20240307, gemini-1.5-flash-latest)", aliases: :m
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def sublayer_version
+        Sublayer::VERSION
+      end
+
+      def ask_for_project_details
+        @ai_provider = options[:provider] || ask("Select an AI provider:", default: "OpenAI", limited_to: %w[OpenAI Claude Gemini])
+        @ai_model = options[:model] || select_ai_model
+      end
+
+      def create_project_directory
+        say "Creating project directory", :green
+
+        empty_directory ".github/workflows"
+      end
+
+      def copy_template_files
+        say "Copying template files", :green
+
+        directory "../templates/github_action", ".github/workflows"
+      end
+
+
+      def generate_configuration
+
+      end
+
+      def finalize_project
+
+      end
+
+      def print_next_steps
+        say "\nSublayer Github Action Project '#{project_name}' created successfully!", :green
+        say "To get started: "
+        say "Create some Sublayer Actions and Sublayer generators within '.github/workflows/#{project_name}/{actions/,generators/}'"
+        say "And edit the file at '.github/workflows/#{project_name}.yml' to set up what you want the action triggered by"
+      end
+
+      private
+      def select_ai_model
+        case @ai_provider
+        when "OpenAI"
+          @ai_provider_key = "OPENAI_API_KEY"
+          ask("Which OpenAI model would you like to use?", default: "gpt-4o", limited_to: %w[gpt-4o gpt-4o-mini gpt-4-turbo gpt-3.5-turbo])
+        when "Claude"
+          @ai_provider_key = "ANTHROPIC_API_KEY"
+          ask("Which Anthropic model would you like to use?", default: "claude-3-5-sonnet-20240620", limited_to: %w[claude-3-5-sonnet-20240620 claude-3-opus-20240620 claude-3-haiku-20240307])
+        when "Gemini"
+          @ai_provider_key = "GEMINI_API_KEY"
+          ask("Which Google model would you like to use?", default: "gemini-1.5-flash-latest", limited_to: %w[gemini-1.5-flash-latest gemini-1.5-pro-latest])
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sublayer/cli/commands/new_project.rb b/lib/sublayer/cli/commands/new_project.rb
@@ -5,7 +5,7 @@ class NewProject < Thor::Group
 
       argument :project_name, type: :string, desc: "The name of your project"
 
-      class_option :template, type: :string, desc: "Type of project (CLI or QuickScript)", aliases: :t
+      class_option :template, type: :string, desc: "Type of project (CLI, GithubAction, QuickScript)", aliases: :t
       class_option :provider, type: :string, desc: "AI provider (OpenAI, Claude, or Gemini)", aliases: :p
       class_option :model, type: :string, desc: "AI model name to use (e.g. gpt-4o, claude-3-haiku-20240307, gemini-1.5-flash-latest)", aliases: :m
 
@@ -21,98 +21,19 @@ def self.banner
         "sublayer new PROJECT_NAME"
       end
 
-      def ask_for_project_details
-        puts options[:template]
-        @project_template = options[:template] || ask("Select a project template:", default: "CLI"
6D40
, limited_to: %w[CLI QuickScript])
-        @ai_provider = options[:provider] || ask("Select an AI provider:", default: "OpenAI", limited_to: %w[OpenAI Claude Gemini])
-        @ai_model = options[:model] || select_ai_model
-      end
-
-      def create_project_directory
-        say "Creating project directory", :green
-        empty_directory project_name
-      end
-
-      def copy_template_files
-        say "Copying template files", :green
-        template_dir = @project_template == "CLI" ? "cli" : "quick_script"
-        directory "../templates/#{template_dir}", project_name
-        empty_directory File.join(project_name, "log") if @project_template =="CLI"
-      end
-
-      def generate_config_file
-        say "Generating configuration", :green
+      def create_project
+        @project_template = options[:template] || ask("Select a project template:", default: "CLI", limited_to: %w[CLI GithubAction QuickScript])
 
-        config = {
-          project_name: project_name,
-          project_template: @project_template,
-          ai_provider: @ai_provider,
-          ai_model: @ai_model
-        }
-
-        if @project_template == "CLI"
-          create_file File.join(project_name, "lib", project_name, "config", "sublayer.yml"), YAML.dump(config)
+        case @project_template.downcase
+        when 'cli'
+          invoke Commands::CLIProject, [project_name], options
+        when 'githubaction', 'github_action'
+          invoke Commands::GithubActionProject, [project_name], options
+        when 'quickscript', 'quick_script'
+          invoke Commands::QuickScriptProject, [project_name], options
         else
-          append_to_file File.join(project_name, "#{project_name}.rb") do
-            <<~CONFIG
-            Sublayer.configuration.ai_provider = Sublayer::Providers::#{config[:ai_provider]}
-            Sublayer.configuration.ai_model = "#{config[:ai_model]}"
-            CONFIG
-          end
-        end
-      end
-
-      def finalize_project
-            say "Finalizing project", :green
-        inside(project_name) do
-          if @project_template == "CLI"
-            chmod("bin/#{project_name}", "+x")
-            run("bundle install") if yes?("Install gems?")
-          else
-            append_to_file "#{project_name}.rb" do
-              <<~INSTRUCTIONS
-              puts "Welcome to your quick Sublayer script!"
-              puts "To get started, create some generators, actions, or agents in their respective directories and call them here"
-              puts "For more information, visit https://docs.sublayer.com"
-              INSTRUCTIONS
-            end
-          end
-
-          run("git init") if yes?("Initialize a git repository?")
-        end
-      end
-
-      def print_next_steps
-        say "\nSublayer project '#{project_name}' created successfully!", :green
-        say "To get started, run:"
-        say "  cd #{project_name}"
-        if @project_template == "CLI"
-          say "  ./bin/#{project_name}"
-        else
-          say "  ruby #{project_name}.rb"
-        end
-      end
-
-      private
-
-      def select_ai_model
-        case @ai_provider
-        when "OpenAI"
-          ask("Which OpenAI model would you like to use?", default: "gpt-4o", limited_to: %w[gpt-4o gpt-4o-mini gpt-4-turbo gpt-3.5-turbo])
-        when "Claude"
-          ask("Which Anthropic model would you like to use?", default: "claude-3-5-sonnet-20240620", limited_to: %w[claude-3-5-sonnet-20240620 claude-3-opus-20240620 claude-3-haiku-20240307])
-        when "Gemini"
-          ask("Which Google model would you like to use?", default: "gemini-1.5-flash-latest", limited_to: %w[gemini-1.5-flash-latest gemini-1.5-pro-latest])
-        end
-      end
-
-      def rename_project_name_directory
-        old_path = File.join(project_name, "lib", "PROJECT_NAME")
-        new_path = File.join(project_name, "lib", project_name.gsub("-", "_").downcase)
-
-        if File.directory?(old_path)
-          say "Renaming project directory", :green
-          FileUtils.mv(old_path, new_path)
+          say "Unknown project template: #{@project_template}", :red
+          exit 1
         end
       end
     end

diff --git a/lib/sublayer/cli/commands/quick_script_project.rb b/lib/sublayer/cli/commands/quick_script_project.rb
@@ -0,0 +1,79 @@
+module Sublayer
+  module Commands
+    class QuickScriptProject < Thor::Group
+      include Thor::Actions
+
+      argument :project_name
+
+      class_option :provider, type: :string, desc: "AI provider (OpenAI, Claude, or Gemini)", aliases: :p
+      class_option :model, type: :string, desc: "AI model name to use (e.g. gpt-4o, claude-3-haiku-20240307, gemini-1.5-flash-latest)", aliases: :m
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def sublayer_version
+        Sublayer::VERSION
+      end
+
+      def ask_for_project_details
+        @ai_provider = options[:provider] || ask("Select an AI provider:", default: "OpenAI", limited_to: %w[OpenAI Claude Gemini])
+        @ai_model = options[:model] || select_ai_model
+      end
+
+      def create_project_directory
+        say "Creating project directory", :green
+
+        empty_directory project_name
+      end
+
+      def copy_template_files
+        say "Copying template files", :green
+
+        directory "../templates/quick_script", project_name
+      end
+
+      def generate_configuration
+        append_to_file File.join(project_name, "#{project_name}.rb") do
+          <<~CONFIG
+            Sublayer.configuration.ai_provider = Sublayer::Providers::#{@ai_provider}
+            Sublayer.configuration.ai_model = "#{@ai_model}"
+          CONFIG
+        end
+      end
+
+      def finalize_project
+        inside(project_name) do
+          append_to_file "#{project_name}.rb" do
+            <<~INSTRUCTIONS
+              puts "Welcome to your quick Sublayer script!"
+              puts "To get started, create some generators, actions, or agents in their respective directories and call them here"
+              puts "For more information, visit https://docs.sublayer.com"
+            INSTRUCTIONS
+          end
+
+          run("git init") if yes?("Initialize a git repository?")
+        end
+      end
+
+      def print_next_steps
+        say "\nSublayer project '#{project_name}' created successfully!", :green
+        say "To get started, run:"
+        say "  cd #{project_name}"
+        say "  ruby #{project_name}.rb"
+      end
+
+      private
+      def select_ai_model
+        case @ai_provider
+        when "OpenAI"
+          ask("Which OpenAI model would you like to use?", default: "gpt-4o", limited_to: %w[gpt-4o gpt-4o-mini gpt-4-turbo gpt-3.5-turbo])
+        when "Claude"
+          ask("Which Anthropic model would you like to use?", default: "claude-3-5-sonnet-20240620", limited_to: %w[claude-3-5-sonnet-20240620 claude-3-opus-20240620 claude-3-haiku-20240307])
+        when "Gemini"
+          ask("Which Google model would you like to use?", default: "gemini-1.5-flash-latest", limited_to: %w[gemini-1.5-flash-latest gemini-1.5-pro-latest])
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sublayer/cli/templates/cli/.gitignore → lib/sublayer/cli/templates/cli/.gitignore.tt b/lib/sublayer/cli/templates/cli/.gitignore → lib/sublayer/cli/templates/cli/.gitignore.tt
diff --git a/lib/sublayer/cli/templates/cli/log/.keep b/lib/sublayer/cli/templates/cli/log/.keep
diff --git a/lib/sublayer/cli/templates/github_action/%project_name%.yml.tt b/lib/sublayer/cli/templates/github_action/%project_name%.yml.tt
@@ -0,0 +1,30 @@
+name: <%= project_name %>
+
+
+# Add a definition of when you want this workflow to trigger here
+#
+# For example, for it to run on every pull request that contains changes to .rb files, use:
+#
+# on:
+#   pull_request:
+#     paths:
+#       - "**/*.rb"
+
+jobs:
+  <%= project_name.gsub("-", "_") %>:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.2.0
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: Install dependencies
+        run: |
+          gem install sublayer octokit
+      - name: Run <%= project_name.gsub("-", "_") %>
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          <%= ai_provider_key %>: ${{ secrets.<%= ai_provider_key %> }}
+
+        run: ruby .github/workflows/<%= project_name %>/<%= project_name %>.rb