forge-cli 0.0.9 → 0.0.10

data/lib/forge-cli/app.rb

@@ -12,7 +12,7 @@ class ForgeCLI::App < Thor
     app = Dir.pwd
     modules = modules.split(',')
     modules.each do |mod|
-      ForgeCLI::ModuleInstaller.install_module!(app, mod)
+      ForgeCLI::ModuleInstaller.install_module!(mod, app)
     end
   end
 

data/lib/forge-cli/application_creator.rb

@@ -8,30 +8,32 @@ class ForgeCLI::ApplicationCreator < ForgeCLI::App
     @modules = modules
   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
+  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
 
-    # Remove some base Rails files that we don't want
-    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
+      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')
 
 
-    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
 end

data/lib/forge-cli/route_installer.rb

@@ -4,37 +4,39 @@ class ForgeCLI::RouteInstaller < Thor
     @module_path = module_path
   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
+  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
     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
-  end
 
-  def routes
-    @routes ||= get_routes
-  end
+    def routes
+      @routes ||= get_routes
+    end
 
-  def forge_routes
-    @forge_routes ||= get_routes('forge_')
-  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
+    def get_routes(prefix = '')
+      file = File.join(@module_path, "#{prefix}routes.rb")
+      if File.exist?(file)
+        File.open(file, "r").read
+      end
     end
   end
 end

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors: