forge-cli 0.0.12 → 0.0.13

data/lib/forge-cli/ability_installer.rb

@@ -1,4 +1,4 @@
-class ForgeCLI::AbilityInstaller < ForgeCLI::App
+class ForgeCLI::AbilityInstaller
   class << self
     def install_abilities!(app, ability_class)
       @app = app

data/lib/forge-cli/app.rb

@@ -1,6 +1,4 @@
 class ForgeCLI::App < Thor
-  include Thor::Actions
-
   desc 'new', 'Create a new Forge app'
   def new(app, modules = '')
     modules = modules.split(',')

data/lib/forge-cli/application_creator.rb

@@ -1,4 +1,4 @@
-class ForgeCLI::ApplicationCreator < ForgeCLI::App
+class ForgeCLI::ApplicationCreator
   def self.create!(app, modules = [])
     new(app, modules).create_application!
   end
@@ -8,65 +8,62 @@ class ForgeCLI::ApplicationCreator < ForgeCLI::App
     @modules = modules
   end
 
-  no_commands do
-    def create_application!
-      system("/usr/bin/env rails new #{@app}")
-      ForgeCLI::ModuleInstaller.install_module!(:base, @app)
-      @modules.each do |mod|
-        ForgeCLI::ModuleInstaller.install_module!(mod, @app)
-      end
+  def create_application!
+    system("/usr/bin/env rails new #{@app}")
+    ForgeCLI::ModuleInstaller.install_module!(:base, @app)
+    @modules.each do |mod|
+      ForgeCLI::ModuleInstaller.install_module!(mod, @app)
+    end
 
-      # Remove some base Rails files that we don't want
-      STDOUT.puts "\nRemoving unneccessary base Rails files..."
-      remove_file File.join(@app, 'app', 'views', 'layouts', 'application.html.erb')
-      remove_file File.join(@app, 'app', 'assets', 'stylesheets', 'application.css')
-      remove_file File.join(@app, 'public', 'index.html')
-      remove_file File.join(@app, 'Gemfile.lock')
+    # Remove some base Rails files that we don't want
+    STDOUT.puts "\nRemoving unneccessary base Rails files..."
+    remove_file File.join(@app, 'app', 'views', 'layouts', 'application.html.erb')
+    remove_file File.join(@app, 'app', 'assets', 'stylesheets', 'application.css')
+    remove_file File.join(@app, 'public', 'index.html')
+    remove_file File.join(@app, 'Gemfile.lock')
 
-      # Copy custom files from ~/.forge
-      if File.exist?(File.join(ENV["HOME"], '.forge'))
-        STDOUT.puts "\nCopying your custom files from ~/.forge"
-        ForgeCLI::CustomFileCopier.copy_files!(@app)
-      end
+    # Copy custom files from ~/.forge
+    if File.exist?(File.join(ENV["HOME"], '.forge'))
+      STDOUT.puts "\nCopying your custom files from ~/.forge"
+      ForgeCLI::CustomFileCopier.copy_files!(@app)
+    end
 
-      # Rewrite Forge3::Application
-      rewrite_app_name
+    # Rewrite Forge3::Application
+    rewrite_app_name
 
-      STDOUT.puts completed_message
-    end
+    STDOUT.puts completed_message
+  end
 
-    def completed_message
-      %{
+  def completed_message
+    %{
 #{"Your new Forge site is almost ready!  Next steps:".foreground(:cyan)}
   1. Run 'bundle install'
   2. Set up config/database.yml
   3. Run 'rake db:migrate'
   4. Run 'rake forge:create_admin
-      }
-    end
+    }
+  end
 
-    private
-      def remove_file(file)
-        if File.exist?(file)
-          STDOUT.puts "      #{"remove".foreground(93, 255, 85)}  #{file.gsub(@app + '/', '')}"
-          FileUtils.rm(file)
-        end
+  private
+    def remove_file(file)
+      if File.exist?(file)
+        STDOUT.puts "      #{"remove".foreground(93, 255, 85)}  #{file.gsub(@app + '/', '')}"
+        FileUtils.rm(file)
       end
+    end
 
-      def rewrite_app_name
-        files = [
-          '/config/environments/production.rb',
-          '/config/application.rb'
-        ]
-        files.each do |file|
-          old_content = File.read(File.join(@app, file))
-          app_name = File.basename(@app).classify
-          new_content = old_content.gsub('Forge3', app_name)
-          File.open(File.join(@app, file), 'w') do |f|
-            f.puts new_content
-          end
+    def rewrite_app_name
+      files = [
+        '/config/environments/production.rb',
+        '/config/application.rb'
+      ]
+      files.each do |file|
+        old_content = File.read(File.join(@app, file))
+        app_name = File.basename(@app).classify
+        new_content = old_content.gsub('Forge3', app_name)
+        File.open(File.join(@app, file), 'w') do |f|
+          f.puts new_content
         end
       end
-
-  end
+    end
 end

data/lib/forge-cli/modules/ecommerce/manifest.yml

@@ -33,7 +33,7 @@ files:
   - 'app/views/forge/products'
   - 'app/views/forge/sales'
   - 'app/views/forge/tax_rates'
-  - 'config/initializers/forge/controllers/ecommerce.rb'
+  - 'lib/forge/shared_controller_methods/ecommerce.rb'
   - 'lib/models/order'
   - 'lib/forge/config/ecommerce.rb'
 

data/lib/forge-cli/modules/ecommerce/post_hooks.rb

@@ -10,6 +10,7 @@ class ForgeCLI::EcommercePostHooks < ForgeCLI::PostHooks
         'class ApplicationController < ActionController::Base',
         "class ApplicationController < ActionController::Base\n  include Forge::Controllers::ECommerce\n"
     )
+    content = "require 'forge/shared_controller_methods/ecommerce.rb'\n" + content
     File.open(app_controller_path, 'w') do |f|
       f.puts content
     end

data/lib/forge-cli/modules/posts/manifest.yml

@@ -7,7 +7,7 @@ files:
   - app/controllers/forge/post_categories_controller.rb
   - app/models/post.rb
   - app/models/post_category.rb
-  - config/initializers/forge/controllers/posts.rb
+  - lib/forge/shared_controller_methods/posts.rb
   - app/views/forge/shared/menu_items/_posts.html.haml
 
 migrations:

data/lib/forge-cli/modules/posts/post_hooks.rb

@@ -10,6 +10,7 @@ class ForgeCLI::PostPostHooks < ForgeCLI::PostHooks
         'class ApplicationController < ActionController::Base',
         "class ApplicationController < ActionController::Base\n  include Forge::Controllers::Posts\n"
     )
+    content = "require 'forge/shared_controller_methods/posts.rb'\n" + content
     File.open(app_controller_path, 'w') do |f|
       f.puts content
     end

data/lib/forge-cli/route_installer.rb

@@ -1,42 +1,40 @@
-class ForgeCLI::RouteInstaller < Thor
+class ForgeCLI::RouteInstaller
   def initialize(app, module_path)
     @app         = app
     @module_path = module_path
   end
 
-  no_commands do
-    def install_routes(type = :normal)
-      file = File.join(@app, 'config', 'routes.rb')
-      existing_routes = File.read(file)
-      if type.to_sym == :normal
-        routes_to_add = routes
-        line = "Application.routes.draw do"
-        indent = 2
-      else
-        routes_to_add = self.send("#{type}_routes")
-        line = "namespace :#{type} do"
-        indent = 4
-      end
-      routes = routes_to_add.split("\n").map {|r| " " * indent + r }.join("\n")
-      updated_routes = existing_routes.gsub(line, "#{line}\n#{routes}")
-      File.open(file, 'w') do |f|
-        f.puts updated_routes
-      end
+  def install_routes(type = :normal)
+    file = File.join(@app, 'config', 'routes.rb')
+    existing_routes = File.read(file)
+    if type.to_sym == :normal
+      routes_to_add = routes
+      line = "Application.routes.draw do"
+      indent = 2
+    else
+      routes_to_add = self.send("#{type}_routes")
+      line = "namespace :#{type} do"
+      indent = 4
     end
-
-    def routes
-      @routes ||= get_routes
+    routes = routes_to_add.split("\n").map {|r| " " * indent + r }.join("\n")
+    updated_routes = existing_routes.gsub(line, "#{line}\n#{routes}")
+    File.open(file, 'w') do |f|
+      f.puts updated_routes
     end
+  end
 
-    def forge_routes
-      @forge_routes ||= get_routes('forge_')
-    end
+  def routes
+    @routes ||= get_routes
+  end
+
+  def forge_routes
+    @forge_routes ||= get_routes('forge_')
+  end
 
-    def get_routes(prefix = '')
-      file = File.join(@module_path, "#{prefix}routes.rb")
-      if File.exist?(file)
-        File.open(file, "r").read
-      end
+  def get_routes(prefix = '')
+    file = File.join(@module_path, "#{prefix}routes.rb")
+    if File.exist?(file)
+      File.open(file, "r").read
     end
   end
 end

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forge-cli
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - factor[e] design initiative