cucumber-chef 2.1.0.rc.11 → 2.1.0.rc.12

data/lib/cucumber/chef/test_lab.rb

@@ -25,7 +25,7 @@ module Cucumber
     class TestLabError < Error; end
 
     class TestLab
-      attr_accessor :provider
+      attr_accessor :provider, :containers
 
 ################################################################################
 
@@ -33,31 +33,28 @@ module Cucumber
         @ui = ui
 
         @provider = Cucumber::Chef::Provider.new(@ui)
+        @containers = Cucumber::Chef::Containers.new(@ui, self)
       end
 
 ################################################################################
 
-      def bootstrap_ssh
-        dead? and raise TestLabError, "The test lab must be running in order to start a bootstrap SSH session!"
+      def bootstrap_ssh(options={})
+        if (!defined?(@bootstrap_ssh) || @bootstrap_ssh.nil?)
+          @bootstrap_ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout}.merge(options))
 
-        if (!defined?(@ssh) || @ssh.nil?)
-          @ssh ||= ZTK::SSH.new(:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout)
-
-          @ssh.config.host_name = self.ip
-          @ssh.config.port = self.port
-          @ssh.config.user = Cucumber::Chef.bootstrap_user
-          @ssh.config.keys = Cucumber::Chef.bootstrap_identity
+          @bootstrap_ssh.config.host_name = self.ip
+          @bootstrap_ssh.config.port = self.port
+          @bootstrap_ssh.config.user = Cucumber::Chef.bootstrap_user
+          @bootstrap_ssh.config.keys = Cucumber::Chef.bootstrap_identity
         end
-        @ssh
+        @bootstrap_ssh
       end
 
 ################################################################################
 
-      def ssh
-        dead? and raise TestLabError, "The test lab must be running in order to start an SSH session!"
-
+      def ssh(options={})
         if (!defined?(@ssh) || @ssh.nil?)
-          @ssh ||= ZTK::SSH.new(:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout)
+          @ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout}.merge(options))
 
           @ssh.config.host_name = self.ip
           @ssh.config.port = self.port
@@ -69,13 +66,11 @@ module Cucumber
 
 ################################################################################
 
-      def proxy_ssh(container)
-        dead? and raise TestLabError, "The test lab must be running in order to start a proxy SSH session!"
-
+      def proxy_ssh(container, options={})
         container = container.to_sym
         @proxy_ssh ||= Hash.new
         if (!defined?(@proxy_ssh[container]) || @proxy_ssh[container].nil?)
-          @proxy_ssh[container] ||= ZTK::SSH.new(:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout)
+          @proxy_ssh[container] ||= ZTK::SSH.new({:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout}.merge(options))
 
           @proxy_ssh[container].config.proxy_host_name = self.ip
           @proxy_ssh[container].config.proxy_port = self.port
@@ -89,38 +84,18 @@ module Cucumber
         @proxy_ssh[container]
       end
 
-################################################################################
-
-      def cc_client
-        dead? and raise TestLabError, "The test lab must be running in order to start the cc-server/client session!"
-
-        @cc_client ||= Cucumber::Chef::Client.new(self, @ui)
-        @cc_client
-      end
-
-################################################################################
-
-      def drb
-        dead? and raise TestLabError, "The test lab must be running in order to start a Drb session!"
-
-        self.cc_client.drb
-      end
-
 ################################################################################
 
       def knife_cli(args, options={})
         options = {:silence => true}.merge(options)
 
-        extracted_options = options.select{ |k,v| [:silence, :expected_exit_code].include?(k) }
-        options.reject!{ |k,v| [:silence, :expected_exit_code].include?(k) }
-
         arguments = Array.new
         arguments << "--user #{Cucumber::Chef::Config.user}"
         arguments << "--server-url #{self.chef_server_api}"
         arguments << "--config #{Cucumber::Chef.knife_rb}" if File.exists?(Cucumber::Chef.knife_rb)
 
         command = Cucumber::Chef.build_command("knife", args, arguments)
-        ZTK::Command.new(options).exec(command, extracted_options)
+        ZTK::Command.new.exec(command, options)
       end
 
 ################################################################################

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.1.0.rc.11" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.12" unless const_defined?(:VERSION)
 
 ################################################################################
 

data/lib/cucumber/chef.rb

@@ -19,10 +19,6 @@
 #
 ################################################################################
 
-require 'drb'
-require 'readline'
-require 'socket'
-require 'stringio'
 require 'benchmark'
 
 ################################################################################
@@ -48,6 +44,7 @@ module Cucumber
 
     autoload :Client, 'cucumber/chef/client'
     autoload :Config, 'cucumber/chef/config'
+    autoload :Containers, 'cucumber/chef/containers'
     autoload :Provider, 'cucumber/chef/provider'
     autoload :Provisioner, 'cucumber/chef/provisioner'
     autoload :TestLab, 'cucumber/chef/test_lab'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.11
+  version: 2.1.0.rc.12
   prerelease: 6
 platform: ruby
 authors:
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -227,8 +227,6 @@ email:
 executables:
 - cc-console
 - cc-knife
-- cc-push
-- cc-server
 - cucumber-chef
 extensions: []
 extra_rdoc_files: []
@@ -245,8 +243,6 @@ files:
 - TODO.md
 - bin/cc-console
 - bin/cc-knife
-- bin/cc-push
-- bin/cc-server
 - bin/cucumber-chef
 - chef_repo/cookbooks/cucumber-chef/LICENSE
 - chef_repo/cookbooks/cucumber-chef/README.md
@@ -258,7 +254,6 @@ files:
 - chef_repo/cookbooks/cucumber-chef/templates/default/db-168-192.erb
 - chef_repo/cookbooks/cucumber-chef/templates/default/db-test-lab.erb
 - chef_repo/cookbooks/cucumber-chef/templates/default/dhcpd-conf.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/gemrc.erb
 - chef_repo/cookbooks/cucumber-chef/templates/default/lxc-initializer-config.erb
 - chef_repo/cookbooks/cucumber-chef/templates/default/lxc-install-chef.erb
 - chef_repo/cookbooks/cucumber-chef/templates/default/motd.erb
@@ -284,15 +279,7 @@ files:
 - lib/cucumber/chef.rb
 - lib/cucumber/chef/client.rb
 - lib/cucumber/chef/config.rb
-- lib/cucumber/chef/helpers.rb
-- lib/cucumber/chef/helpers/chef_client.rb
-- lib/cucumber/chef/helpers/chef_server.rb
-- lib/cucumber/chef/helpers/command.rb
-- lib/cucumber/chef/helpers/container.rb
-- lib/cucumber/chef/helpers/minitest.rb
-- lib/cucumber/chef/helpers/server.rb
-- lib/cucumber/chef/helpers/test_lab.rb
-- lib/cucumber/chef/helpers/utility.rb
+- lib/cucumber/chef/containers.rb
 - lib/cucumber/chef/provider.rb
 - lib/cucumber/chef/providers/aws.rb
 - lib/cucumber/chef/providers/vagrant.rb

data/bin/cc-push

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-require 'cucumber-chef'
-
-tag = Cucumber::Chef.tag("cc-push")
-puts(tag)
-Cucumber::Chef.boot(tag)
-
-ui = ZTK::UI.new(:logger => Cucumber::Chef.logger)
-if (test_lab = Cucumber::Chef::TestLab.new(ui)) && test_lab.alive?
-  gem_name = "cucumber-chef-#{Cucumber::Chef::VERSION}.gem"
-  gem_path = File.join(Cucumber::Chef.root_dir, gem_name)
-
-  ui.logger.info { "gem_name == '#{gem_name}'" }
-  ui.logger.info { "gem_path == '#{gem_path}'" }
-
-  if !File.exists?(gem_path)
-    puts
-    puts("To build cucumber-chef and install the gem in to the test lab, execute:")
-    puts
-    puts [ "cd #{Cucumber::Chef.root_dir}", "gem build cucumber-chef.gemspec", "cd #{Dir.pwd}", "bundle exec cc-push" ].join(" ; ")
-    puts
-  else
-    local_file = File.join(Cucumber::Chef.root_dir, gem_name)
-    remote_file = File.join("/", "home", test_lab.bootstrap_ssh.config.user, gem_name)
-    ui.logger.info { "#{local_file} -> #{test_lab.bootstrap_ssh.config.user}@#{test_lab.ip}:#{remote_file}" }
-
-    test_lab.bootstrap_ssh.upload(local_file, remote_file)
-    FileUtils.rm_f(File.join(Cucumber::Chef.root_dir, "*.gem"))
-
-    test_lab.bootstrap_ssh.exec(<<-EOH
-sudo /bin/bash -c '
-pkill -9 cc-server
-cd #{File.dirname(remote_file)}
-ls -la | grep 'cucumber-chef-'
-gem uninstall cucumber-chef ztk --all --ignore-dependencies --executables --backtrace
-rm -fv /usr/lib/ruby/gems/1.8/cache/#{gem_name}
-gem cleanup cucumber-chef --backtrace
-gem install #{remote_file} --backtrace
-rm -fv /home/#{test_lab.bootstrap_ssh.config.user}/*.gem
-exit 0'
-EOH
-    )
-    File.exists?(gem_path) and File.delete(gem_path)
-  end
-
-else
-  puts("No running cucumber-chef test labs to connect to!")
-  exit(1)
-end

data/bin/cc-server

@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-if !ENV['BACKGROUND'].nil?
-  if RUBY_VERSION < "1.9"
-    exit if fork
-    Process.setsid
-    exit if fork
-    Dir.chdir "/"
-    STDIN.reopen "/dev/null"
-    STDOUT.reopen "/dev/null", "a"
-    STDERR.reopen "/dev/null", "a"
-  else
-    Process.daemon
-  end
-end
-
-require 'drb/drb'
-require 'drb/acl'
-require 'cucumber-chef'
-require 'cucumber/chef/helpers'
-
-tag = Cucumber::Chef.tag("cc-server")
-puts("  * #{tag}")
-Cucumber::Chef.boot(tag)
-$logger = Cucumber::Chef.logger
-Dir.chdir(File.join("/home", Cucumber::Chef.lab_user))
-
-class FrontObject
-  attr_accessor :containers
-
-  include Cucumber::Chef
-  include Cucumber::Chef::Helpers
-
-################################################################################
-
-  def initialize
-    logger.info { "DRB=#{DRb.config.inspect}" }
-
-    if ENV['PURGE'] == 'YES'
-      Cucumber::Chef.logger.warn { "PURGING CONTAINERS!  Container attributes will be reset!" }
-      load_containers
-      containers.each do |name, value|
-        server_destroy(name)
-      end
-
-      File.exists?(Cucumber::Chef.containers_bin) && File.delete(Cucumber::Chef.containers_bin)
-      load_containers
-    else
-      Cucumber::Chef.logger.info { "Allowing existing containers to persist." }
-    end
-  end
-
-################################################################################
-
-  def shutdown
-    logger.fatal { "Shutting down." }
-    DRb.stop_service
-    exit(0)
-  end
-
-################################################################################
-
-  def logger
-    $logger
-  end
-
-################################################################################
-
-  def ping
-    "pong"
-  end
-
-################################################################################
-
-end
-
-list = %w(deny all)
-ARGV[0] and (list += [ 'allow', ARGV[0] ])
-acl = ACL.new(list)
-
-# This will break everything:
-# $SAFE = 1
-
-DRb.start_service("druby://:8787", FrontObject.new)
-DRb.thread.join

data/chef_repo/cookbooks/cucumber-chef/templates/default/gemrc.erb

@@ -1,10 +0,0 @@
----
-:bulk_threshold: 1000
-:update_sources: true
-:sources:
-- http://rubygems.org
-- http://gems.github.com
-:backtrace: true
-:verbose: true
-:benchmark: false
-gem: --no-ri --no-rdoc --conservative

data/lib/cucumber/chef/helpers/chef_client.rb

@@ -1,167 +0,0 @@
-################################################################################
-#
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
-#     License: Apache License, Version 2.0
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-################################################################################
-
-module Cucumber::Chef::Helpers::ChefClient
-
-################################################################################
-
-  # call this in a Before hook
-  def chef_set_client_config(config={})
-    @chef_client_config = (@chef_client_config || {
-      :log_level => :info,
-      :log_location => "/var/log/chef/client.log",
-      :chef_server_url => "https://api.opscode.com/organizations/#{config[:orgname]}",
-      :validation_client_name => "#{config[:orgname]}-validator",
-      :ssl_verify_mode => :verify_none,
-      :environment => nil # use default; i.e. set no value
-    }).merge(config)
-    logger.info { "Setting chef client config '#{@chef_client_config.inspect}'." }
-
-    true
-  end
-
-################################################################################
-
-  # call this before chef_run_client
-  def chef_set_client_attributes(name, attributes={})
-    @containers[name] ||= Hash.new
-    @containers[name][:chef_client] = (@containers[name][:chef_client] || {}).merge(attributes) { |k,o,n| (k = (o + n).uniq) }
-    logger.info { "Setting chef client attributes to '#{@containers[name][:chef_client].inspect}' for container '#{name}'." }
-
-    true
-  end
-
-################################################################################
-
-  def chef_run_client(name, *args)
-    chef_config_client(name)
-
-    logger.info { "Removing artifacts #{Cucumber::Chef::Config[:artifacts].values.collect{|z| "'#{z}'" }.join(' ')}." }
-    (command_run_remote(name, "/bin/rm -fv #{Cucumber::Chef::Config[:artifacts].values.join(' ')}") rescue nil)
-
-    logger.info { "Running chef client on container '#{name}'." }
-
-    arguments = {
-      "--node-name" => name,
-      "--json-attributes" => File.join("/etc", "chef", "attributes.json").to_s,
-      "--log_level" => @chef_client_config[:log_level],
-      "--logfile" => @chef_client_config[:log_location],
-      "--server" => @chef_client_config[:chef_server_url],
-      "--environment" => @chef_client_config[:environment]
-    }.reject{ |k,v| v.nil? }.sort
-
-    output = nil
-    bm = ::Benchmark.realtime do
-      output = command_run_remote(name, ["/usr/bin/chef-client", arguments, args, "--once"].flatten.join(" "))
-    end
-    logger.info { "Chef client run on container '#{name}' took %0.4f seconds." % bm }
-
-    output
-  end
-
-################################################################################
-
-  def chef_config_client(name)
-    # make sure our configuration location is there
-    client_rb = File.join("/", container_root(name), "etc/chef/client.rb")
-    FileUtils.mkdir_p(File.dirname(client_rb))
-
-    # render the chef-client client.rb if we are configured to
-    if Cucumber::Chef::Config.chef[:render_client_rb]
-      File.exists?(client_rb) && File.delete(client_rb)
-
-      max_key_size = @chef_client_config.keys.collect{ |z| z.to_s.size }.max
-
-      File.open(client_rb, 'w') do |f|
-        f.puts(Cucumber::Chef.generate_do_not_edit_warning("Chef Client Configuration"))
-        f.puts
-        @chef_client_config.merge(:node_name => name).each do |(key,value)|
-          next if value.nil?
-          f.puts("%-#{max_key_size}s  %s" % [key, value.inspect])
-        end
-        f.puts
-        f.puts("Mixlib::Log::Formatter.show_time = true")
-      end
-    end
-
-    attributes_json = File.join("/", container_root(name), "etc", "chef", "attributes.json")
-    FileUtils.mkdir_p(File.dirname(attributes_json))
-    File.open(attributes_json, 'w') do |f|
-      f.puts((@containers[name][:chef_client] || {}).to_json)
-    end
-
-    # make sure our log location is there
-    log_location = File.join("/", container_root(name), @chef_client_config[:log_location])
-    FileUtils.mkdir_p(File.dirname(log_location))
-
-    command_run_local("cp /etc/chef/validation.pem #{container_root(name)}/etc/chef/ 2>&1")
-
-    true
-  end
-
-################################################################################
-
-  def chef_client_artifacts(name)
-    # this is messy and needs to be refactored into a more configurable
-    # solution; but for now this should do the trick
-
-    ssh = $test_lab.proxy_ssh(name)
-
-    feature_file = $scenario.file_colon_line.split(":").first
-    feature_line = $scenario.file_colon_line.split(":").last
-    scenario_tag = $scenario.name.gsub(" ", "_")
-
-    feature_name = File.basename(feature_file, ".feature")
-    feature_dir = feature_file.split("/")[-2]
-
-    Cucumber::Chef::Config[:artifacts].each do |label, remote_path|
-      result = ssh.exec("/bin/bash -c '[[ -f #{remote_path} ]] ; echo $?'", :silence => true)
-      if (result.output =~ /0/)
-        logger.info { "Retrieving artifact '#{remote_path}' from container '#{name}'." }
-
-        local_path = File.join(Cucumber::Chef.artifacts_dir, feature_dir, "#{feature_name}.txt")
-        tmp_path = File.join("/tmp", label)
-
-        FileUtils.mkdir_p(File.dirname(local_path))
-        ssh.download(remote_path, tmp_path)
-        data = IO.read(tmp_path).chomp
-
-        message = "#{$scenario.name} (#{File.basename(feature_file)}:#{feature_line}:#{label})"
-        header = ("-" * message.length)
-
-        f = File.open(local_path, "a")
-        f.write("#{header}\n")
-        f.write("#{message}\n")
-        f.write("#{header}\n")
-        f.write("#{data}\n")
-
-        File.chmod(0644, local_path)
-      end
-    end
-
-    true
-  end
-
-################################################################################
-
-end
-
-################################################################################

data/lib/cucumber/chef/helpers/chef_server.rb

@@ -1,42 +0,0 @@
-################################################################################
-#
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
-#     License: Apache License, Version 2.0
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-################################################################################
-
-module Cucumber::Chef::Helpers::ChefServer
-
-################################################################################
-
-  def chef_server_node_destroy(name)
-    (::Chef::Node.load(name).destroy rescue nil)
-    logger.info { "Destroyed chef node '#{name}'." }
-  end
-
-################################################################################
-
-  def chef_server_client_destroy(name)
-    (::Chef::ApiClient.load(name).destroy rescue nil)
-    logger.info { "Destroyed chef client '#{name}'." }
-  end
-
-################################################################################
-
-end
-
-################################################################################

data/lib/cucumber/chef/helpers/command.rb

@@ -1,60 +0,0 @@
-################################################################################
-#
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
-#     License: Apache License, Version 2.0
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-################################################################################
-
-module Cucumber::Chef::Helpers::Command
-
-################################################################################
-
-  def command_run_remote(name, command, options={})
-    expected_exit_code = (options[:expected_exit_code] || 0)
-    options.reject!{ |k,v| k == :expected_exit_code }
-
-    identity_file = File.join(Cucumber::Chef.lab_user_home_dir, ".ssh", "id_rsa")
-
-    command = %W(/usr/bin/ssh #{ENV['LOG_LEVEL'] == 'DEBUG' ? "-v" : nil} -i #{identity_file} #{name} #{command})
-    ::ZTK::Command.new({:timeout => Cucumber::Chef::Config.command_timeout}.merge(options)).exec(command.compact.join(" "), :silence => true, :exit_code => expected_exit_code)
-  end
-
-################################################################################
-
-  def command_run_chroot(name, command, options={})
-    expected_exit_code = (options[:expected_exit_code] || 0)
-    options.reject!{ |k,v| k == :expected_exit_code }
-
-    command = %Q(/usr/sbin/chroot #{container_root(name)} /bin/bash -c '#{command.gsub("'", '"')}')
-    ::ZTK::Command.new({:timeout => Cucumber::Chef::Config.command_timeout}.merge(options)).exec(command, :silence => true, :exit_code => expected_exit_code)
-  end
-
-################################################################################
-
-  def command_run_local(command, options={})
-    expected_exit_code = (options[:expected_exit_code] || 0)
-    options.reject!{ |k,v| k == :expected_exit_code }
-
-    command = %Q(/bin/bash -c '#{command.gsub("'", '"')}')
-    ::ZTK::Command.new({:timeout => Cucumber::Chef::Config.command_timeout}.merge(options)).exec(command, :silence => true, :exit_code => expected_exit_code)
-  end
-
-################################################################################
-
-end
-
-################################################################################