test-kitchen 1.0.0.alpha.0 → 1.0.0.alpha.1

data/lib/kitchen/instance.rb

@@ -184,12 +184,15 @@ module Kitchen
     #
     # **Note** This method calls exec and will not return.
     #
+    # @see Driver::LoginCommand
     # @see Driver::Base#login_command
     def login
-      command, *args = driver.login_command(state_file.read)
+      login_command = driver.login_command(state_file.read)
+      command, *args = login_command.cmd_array
+      options = login_command.options
 
-      debug("Login command: #{command} #{args.join(' ')}")
-      Kernel.exec(command, *args)
+      debug("Login command: #{command} #{args.join(' ')} (Options: #{options})")
+      Kernel.exec(command, *args, options)
     end
 
     def last_action

data/lib/kitchen/loader/yaml.rb

@@ -97,7 +97,7 @@ module Kitchen
         return Hash.new if string.nil? || string.empty?
 
         ::YAML.safe_load(string)
-      rescue SyntaxError => ex
+      rescue SyntaxError, Psych::SyntaxError => ex
         raise UserError, "Error parsing #{file_name} (#{ex.message})"
       end
     end

data/lib/kitchen/shell_out.rb

@@ -32,20 +32,43 @@ module Kitchen
     # Executes a command in a subshell on the local running system.
     #
     # @param cmd [String] command to be executed locally
-    # @param use_sudo [TrueClass, FalseClass] whether or not to use sudo
-    # @param log_subject [String] used in the output or log header for clarity
-    #   and context
+    # @param options [Hash] additional configuration of command
+    # @option options [TrueClass, FalseClass] :use_sudo whether or not to use
+    #   sudo
+    # @option options [String] :log_subject used in the output or log header
+    #   for clarity and context. Default is "local".
+    # @option options [TrueClass, FalseClass] :quiet whether or not to echo
+    #   logging commands. Default is false.
+    # @option options [String] :cwd the directory to chdir to before running
+    #   the command
+    # @option options [Hash] :environment a Hash of environment variables to
+    #   set before the command is run. By default, the environment will
+    #   *always* be set to 'LC_ALL' => 'C' to prevent issues with multibyte
+    #   characters in Ruby 1.8. To avoid this, use :environment => nil for
+    #   *no* extra environment settings, or
+    #   :environment => {'LC_ALL'=>nil, ...} to set other environment settings
+    #   without changing the locale.
+    # @option options [Integer] :timeout Numeric value for the number of
+    #   seconds to wait on the child process before raising an Exception.
+    #   This is calculated as the total amount of time that ShellOut waited on
+    #   the child process without receiving any output (i.e., IO.select
+    #   returned nil). Default is 60000 seconds. Note: the stdlib Timeout
+    #   library is not used.
+    # @return [String] the standard output of the command as a String
     # @raise [ShellCommandFailed] if the command fails
     # @raise [Error] for all other unexpected exceptions
-    def run_command(cmd, use_sudo = false, log_subject = "local")
+    def run_command(cmd, options = {})
+      use_sudo = options[:use_sudo].nil? ? false : options[:use_sudo]
+      quiet = options[:quiet]
       cmd = "sudo #{cmd}" if use_sudo
-      subject = "[#{log_subject} command]"
+      subject = "[#{options[:log_subject] || "local"} command]"
 
-      info("#{subject} BEGIN (#{display_cmd(cmd)})")
-      sh = Mixlib::ShellOut.new(cmd, :live_stream => logger, :timeout => 60000)
+      info("#{subject} BEGIN (#{display_cmd(cmd)})") unless quiet
+      sh = Mixlib::ShellOut.new(cmd, shell_opts(options))
       sh.run_command
-      info("#{subject} END #{Util.duration(sh.execution_time)}")
+      info("#{subject} END #{Util.duration(sh.execution_time)}") unless quiet
       sh.error!
+      sh.stdout
     rescue Mixlib::ShellOut::ShellCommandFailed => ex
       raise ShellCommandFailed, ex.message
     rescue Exception => error
@@ -61,5 +84,12 @@ module Kitchen
 
       newline == "\n" ? "#{first_line}\\n...#{last_char}" : cmd
     end
+
+    def shell_opts(options)
+      filtered_opts = options.reject do |key, value|
+        [:use_sudo, :log_subject, :quiet].include?(key)
+      end
+      { :live_stream => logger, :timeout => 60000 }.merge(filtered_opts)
+    end
   end
 end

data/lib/kitchen/state_file.rb

@@ -77,7 +77,7 @@ module Kitchen
 
     def deserialize_string(string)
       ::YAML.safe_load(string)
-    rescue SyntaxError => ex
+    rescue SyntaxError, Psych::SyntaxError => ex
       raise StateFileLoadError, "Error parsing #{file_name} (#{ex.message})"
     end
 

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.alpha.0"
+  VERSION = "1.0.0.alpha.1"
 end

data/spec/kitchen/config_spec.rb

@@ -148,7 +148,8 @@ describe Kitchen::Config do
         ]
       })
       config.instances.size.must_equal 5
-      config.instances.map { |i| i.name }.must_equal %w{s1-p1 s1-p2 s2-p1 s2-p2 s3-p2}
+      instance_names = config.instances.map { |i| i.name }
+      instance_names.must_equal %w{s1-p1 s1-p2 s2-p1 s2-p2 s3-p2}
     end
 
     it "returns an instance containing a driver instance" do

data/spec/kitchen/state_file_spec.rb

@@ -28,7 +28,7 @@ end
 
 describe Kitchen::StateFile do
 
-  let(:state_file)  { Kitchen::StateFile.new('/tmp', 'oftheunion')}
+  let(:state_file)  { Kitchen::StateFile.new('/tmp', 'oftheunion') }
   let(:file_name)   { '/tmp/.kitchen/oftheunion.yml' }
 
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.0
+  version: 1.0.0.alpha.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -326,14 +326,17 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/kitchen
-- features/cli.feature
-- features/cli_init.feature
+- features/kitchen_command.feature
+- features/kitchen_driver_discover_command.feature
+- features/kitchen_init_command.feature
+- features/step_definitions/gem_steps.rb
 - features/support/env.rb
 - lib/kitchen.rb
 - lib/kitchen/busser.rb
@@ -347,6 +350,8 @@ files:
 - lib/kitchen/driver/dummy.rb
 - lib/kitchen/driver/ssh_base.rb
 - lib/kitchen/errors.rb
+- lib/kitchen/generator/init.rb
+- lib/kitchen/generator/new_plugin.rb
 - lib/kitchen/instance.rb
 - lib/kitchen/instance_actor.rb
 - lib/kitchen/loader/yaml.rb
@@ -407,8 +412,10 @@ signing_key:
 specification_version: 3
 summary: A Chef convergence integration test harness
 test_files:
-- features/cli.feature
-- features/cli_init.feature
+- features/kitchen_command.feature
+- features/kitchen_driver_discover_command.feature
+- features/kitchen_init_command.feature
+- features/step_definitions/gem_steps.rb
 - features/support/env.rb
 - spec/kitchen/collection_spec.rb
 - spec/kitchen/color_spec.rb

data/features/cli.feature

@@ -1,17 +0,0 @@
-Feature: Ensure that the Command Line Interface works as designed
-  In order to test code via CLI
-  As an Operator
-  I want to run the CLI with different arguments
-
-Scenario: Running the help command exits cleanly
-  When I successfully run `kitchen help`
-  Then the exit status should be 0
-  And the output should contain "kitchen console"
-  And a file named ".kitchen/logs/kitchen.log" should exist
-
-Scenario: Show the version number
-  When I successfully run `kitchen version`
-  Then the exit status should be 0
-  
-
-

data/features/cli_init.feature

@@ -1,156 +0,0 @@
-Feature: Ensure that the Command Line Interface init creates the correct files
-  In order to initialize an un-Kitchenified cookbook
-  As an Operator
-  I want to initialize a cookbook
-
-
-@ok
-Scenario: Basic init with no extras succeeds
-  When I run `kitchen init` interactively
-  And I type "n"
-  Then the exit status should be 0
-  And a directory named ".kitchen" should exist
-  And a directory named "test/integration/default" should exist
-  And the file ".gitignore" should contain:
-  """
-  .kitchen/
-  .kitchen.local.yml
-  """
-  And the file ".kitchen.yml" should contain:
-  """
-  ---
-  driver_plugin: vagrant
-  platforms:
-  - name: ubuntu-12.04
-    driver_config:
-      box: opscode-ubuntu-12.04
-      box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box
-    run_list:
-    - recipe[apt]
-  - name: ubuntu-10.04
-    driver_config:
-      box: opscode-ubuntu-10.04
-      box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box
-    run_list:
-    - recipe[apt]
-  - name: centos-6.3
-    driver_config:
-      box: opscode-centos-6.3
-      box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box
-    run_list:
-    - recipe[yum::epel]
-  - name: centos-5.8
-    driver_config:
-      box: opscode-centos-5.8
-      box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box
-    run_list:
-    - recipe[yum::epel]
-  suites:
-  - name: default
-    run_list: []
-    attributes: {}
-  """
-  And a file named "Gemfile" should not exist
-  And a file named "Rakefile" should not exist
-  And a file named "Thorfile" should not exist
-
-
-
-@ok
-Scenario: Running with a Rakefile file appends Kitchen tasks
-  Given an empty file named "Rakefile"
-  When I run `kitchen init` interactively
-  And I type "n"
-  Then the exit status should be 0
-  And the file "Rakefile" should contain exactly:
-  """
-  
-  begin
-    require 'kitchen/rake_tasks'
-    Kitchen::RakeTasks.new
-  rescue LoadError
-    puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
-  end
-
-  """
-
-
-@ok
-Scenario: Running with a Thorfile file appends Kitchen tasks
-  Given an empty file named "Thorfile"
-  When I run `kitchen init` interactively
-  And I type "n"
-  Then the exit status should be 0
-  And the file "Thorfile" should contain exactly:
-  """
-  
-  begin
-    require 'kitchen/thor_tasks'
-    Kitchen::ThorTasks.new
-  rescue LoadError
-    puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
-  end
-
-  """
-
-
-@ok
-Scenario: Listing the drivers provides correct output, does not write Gemfile
-  When I run `kitchen init` interactively
-  And I type "y"
-  And I type "list"
-  And I type "skip"
-  Then the exit status should be 0
-  And a file named ".kitchen.yml" should exist
-  And a directory named ".kitchen" should exist
-  And a file named "Gemfile" should not exist
-
-
-@ok
-Scenario: Running the init command without a Gemfile provides warning and fails
-  When I run `kitchen init` interactively
-  And I type "y"
-  And I type "kitchen-vagrant"
-  And the output should contain "You do not have an existing Gemfile"
-  Then the exit status should be 1
-
-
-@ok
-Scenario: Running the init command succeeds
-  Given an empty file named "Gemfile"
-  When I run `kitchen init` interactively
-  And I type "y"
-  And I type "kitchen-vagrant"
-  Then the exit status should be 0
-  And the output should contain "You must run `bundle install' to fetch any new gems."
-  And a file named ".kitchen.yml" should exist
-  And a file named ".gitignore" should exist
-  And the file "Gemfile" should contain "gem 'kitchen-vagrant', :group => :integration"
-
-
-@ok
-Scenario: Running init with a correct metadata.rb works
-  Given a file named "metadata.rb" with:
-  """
-  name              "ntp"
-  license           "Apache 2.0"
-  description       "Installs and configures ntp as a client or server"
-  version           "0.1.0"
-  recipe "ntp", "Installs and configures ntp either as a server or client"
-
-  %w{ ubuntu debian redhat centos fedora scientific amazon oracle freebsd }.each do |os|
-    supports os
-  end
-  """
-  When I run `kitchen init` interactively
-  And I type "n"
-  Then the exit status should be 0
-  And the file ".kitchen.yml" should contain:
-  """
-  suites:
-  - name: default
-    run_list:
-    - recipe[ntp]
-    attributes: {}
-  """
-