incline 0.2.3 → 0.2.4

data/lib/incline/cli.rb

@@ -6,6 +6,7 @@ require 'incline/cli/helpers/yaml'
 
 require 'incline/cli/version'
 require 'incline/cli/usage'
+require 'incline/cli/prepare'
 
 
 module Incline
@@ -18,14 +19,14 @@ module Incline
 
     def execute(*args)
       begin
-        if args.empty? || %w(usage help /? -? -help --help).include?(args.first)
+        if args.empty? || %w(help /? -? -help --help).include?(args.first)
           process_command(:usage)
         else
           process_command(*args)
         end
       rescue UsageError => err
         STDERR.puts err.message
-        process_command(:usage)
+        process_command(:usage, err.command)
       rescue CliError => err
         STDERR.puts ANSI.code(:red) { 'ERROR:' }
         STDERR.puts err.message
@@ -40,27 +41,27 @@ module Incline
       cmd_info = self.class.command_list.find{|c| c[:method] == command}
       if cmd_info
         args = args.dup
-        args = []
+        command_args = []
         cmd_info[:new_params].each do |(type,name)|
           if type == :rest
-            args += args
+            command_args += args
             break
           elsif type == :req
             if args.empty?
               raise UsageError, "Missing required parameter '#{name}' for command '#{command}'."
             end
-            args << args.delete_at(0)
+            command_args << args.delete_at(0)
           elsif type == :opt
             if args.empty?
               break
             else
-              args << args.delete_at(0)
+              command_args << args.delete_at(0)
             end
           else
             raise UsageError, "Unknown parameter type '#{type}' for command '#{command}'."
           end
         end
-        cmd_object = cmd_info[:klass].new(*args)
+        cmd_object = cmd_info[:klass].new(*command_args)
         cmd_object.send(:run)
       else
         raise UsageError, "Unknown command '#{command}'."
@@ -80,9 +81,9 @@ module Incline
           begin
             constants.map do |c|
               klass = const_get c
-              # class must have a :new class method and a :run instance method.
+              # class must have a :new class method (:initialize instance method) and a :run instance method.
               if klass.instance_methods.include?(:run) && klass.methods.include?(:new)
-                m = klass.method(:new)
+                m = klass.instance_method(:initialize)
                 new_params = m.parameters.select{ |p| p[1] && (p[0] == :req || p[0] == :opt || p[0] == :rest) }.freeze
                 m = klass.instance_method(:run)
                 run_params = m.parameters.select{ |p| p[1] && (p[0] == :req || p[0] == :opt || p[0] == :rest) }.freeze

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/templates/test_unit/scaffold/functional_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  setup do
+    @<%= singular_table_name %> = <%= fixture_name %>(:one)
+<% if mountable_engine? -%>
+    @routes = Engine.routes
+<% end -%>
+    # Log in as the admin to ensure full access.
+    # You may want to test accessibility separately.
+    log_in_as incline_users(:admin)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create <%= singular_table_name %>" do
+    # To avoid issues with uniqueness, we destroy the item first.
+    @<%= singular_table_name %>.destroy
+    
+    # Now we should be able to create an item with the same info. 
+    assert_difference('<%= class_name %>.count') do
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+    end
+
+    assert_redirected_to <%= index_helper %>_path
+  end
+
+  test "should show <%= singular_table_name %>" do
+    get :show, id: <%= "@#{singular_table_name}" %>
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: <%= "@#{singular_table_name}" %>
+    assert_response :success
+  end
+
+  test "should update <%= singular_table_name %>" do
+    patch :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+    assert_redirected_to <%= index_helper %>_path
+  end
+
+  test "should destroy <%= singular_table_name %>" do
+    assert_difference('<%= class_name %>.count', -1) do
+      delete :destroy, id: <%= "@#{singular_table_name}" %>
+    end
+
+    assert_redirected_to <%= index_helper %>_path
+  end
+end
+<% end -%>

data/test/cli/yaml_contents_test.rb

@@ -49,6 +49,47 @@ two:
   bravo: 2
   echo: 5
 
+three:
+  charlie: 3
+  foxtrot: 6
+  YAML
+
+  PRE_REMOVE_YAML = <<-YAML.strip
+# Top of file.
+
+one:
+  alpha: 1
+  delta: 4
+
+two:  # the second section
+  bravo: 2
+  echo: <%= 'hello' %>  # just a simple embedded ruby command.
+
+three:
+  charlie: 3
+  foxtrot: 6
+  YAML
+  
+  POST_REMOVE_RESULT = <<-YAML.strip
+# Top of file.
+
+one:
+  alpha: 1
+  delta: 4
+
+
+three:
+  charlie: 3
+  foxtrot: 6
+  YAML
+
+  POST_POST_REMOVE_RESULT = <<-YAML.strip
+# Top of file.
+
+one:
+  delta: 4
+
+
 three:
   charlie: 3
   foxtrot: 6
@@ -84,5 +125,47 @@ three:
 
     assert_equal MULTIPLE_ADD_RESULT, contents.to_s.strip
   end
+  
+  test 'remove_key works as expected' do
+    contents = Incline::CliHelpers::Yaml::YamlContents.new(PRE_REMOVE_YAML)
+    
+    extracted = contents.remove_key %w(two)
+    
+    assert_equal POST_REMOVE_RESULT, contents.to_s.strip
+    
+    # there should be three items in the extracted contents.
+    assert_equal 3, extracted.length
+    
+    # the first item should be the base key.
+    assert_equal %w(two), extracted[0][:key]
+    assert_equal '', extracted[0][:value]
+    assert_equal 'the second section', extracted[0][:comment]
+    assert extracted[0][:safe]
+    
+    # followed by bravo.
+    assert_equal %w(two bravo), extracted[1][:key]
+    assert_equal '2', extracted[1][:value]
+    assert_nil extracted[1][:comment]
+    assert extracted[1][:safe]
+    
+    # and finally echo.
+    assert_equal %w(two echo), extracted[2][:key]
+    assert_equal '<%= \'hello\' %>', extracted[2][:value]
+    assert_equal 'just a simple embedded ruby command.', extracted[2][:comment]
+    assert extracted[2][:safe]
+    
+    # one more test just to ensure we can remove subkeys safely.
+    extracted = contents.remove_key %w(one alpha)
+    
+    assert_equal POST_POST_REMOVE_RESULT, contents.to_s.strip
+    assert_equal 1, extracted.length
+    
+    extracted = extracted.first
+    assert_equal %w(one alpha), extracted[:key]
+    assert_equal '1', extracted[:value]
+    assert_nil extracted[:comment]
+    assert extracted[:safe]
+    
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +398,22 @@ files:
 - lib/incline/cli.rb
 - lib/incline/cli/errors.rb
 - lib/incline/cli/helpers/yaml.rb
+- lib/incline/cli/prepare.rb
+- lib/incline/cli/prepare/add_deploy_user.rb
+- lib/incline/cli/prepare/config_passenger.rb
+- lib/incline/cli/prepare/config_ssh.rb
+- lib/incline/cli/prepare/create_nginx_utils.rb
+- lib/incline/cli/prepare/extend_shell.rb
+- lib/incline/cli/prepare/install_db.rb
+- lib/incline/cli/prepare/install_flytrap.rb
+- lib/incline/cli/prepare/install_passenger.rb
+- lib/incline/cli/prepare/install_prereqs.rb
+- lib/incline/cli/prepare/install_rails.rb
+- lib/incline/cli/prepare/install_rbenv.rb
+- lib/incline/cli/prepare/install_ruby.rb
+- lib/incline/cli/prepare/restart_nginx.rb
+- lib/incline/cli/prepare/ssh_copy_id.rb
+- lib/incline/cli/prepare/update_system.rb
 - lib/incline/cli/usage.rb
 - lib/incline/cli/version.rb
 - lib/incline/data_tables_request.rb
@@ -453,6 +469,7 @@ files:
 - lib/templates/jbuilder/scaffold/index.json.jbuilder
 - lib/templates/jbuilder/scaffold/show.json.jbuilder
 - lib/templates/rails/scaffold_controller/controller.rb
+- lib/templates/test_unit/scaffold/functional_test.rb
 - test/cli/yaml_contents_test.rb
 - test/controllers/incline/access_groups_controller_test.rb
 - test/controllers/incline/access_test_controller_test.rb
@@ -587,7 +604,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A gem designed to get off to an even quicker start with Rails.