test-kitchen 0.6.0 → 0.7.0.beta.1

data/config/Cheffile

@@ -21,13 +21,6 @@ require 'test-kitchen'
 site 'http://community.opscode.com/api/v1'
 
 # base test-kitchen cookbooks
-cookbook 'apt', '1.4.6'
-cookbook 'yum', '0.8.0'
-cookbook 'build-essential', '1.1.0'
-cookbook 'git', '1.0.0'
-cookbook 'rvm',
-  :git => 'https://github.com/fnichol/chef-rvm.git',
-  :ref => 'c27a8942ed311ccce2c63c2e863201b049c70a0d'
 cookbook 'test-kitchen',
   :path => TestKitchen.source_root.join('cookbooks', 'test-kitchen').to_s
 

data/lib/test-kitchen/cli/destroy.rb

@@ -27,12 +27,6 @@ module TestKitchen
         banner "kitchen destroy (options)"
 
         def run
-          options = {
-            :platform => config[:platform],
-            :configuration => config[:configuration]
-          }
-
-          runner = TestKitchen::Runner.targets['vagrant'].new(env, options)
           runner.destroy
         end
 

data/lib/test-kitchen/cli.rb

@@ -54,6 +54,14 @@ module TestKitchen
         :show_options => true,
         :exit => 0
 
+      option :version,
+        :short => "-v",
+        :long => "--version",
+        :description => "Show Test Kitchen version",
+        :boolean => true,
+        :proc => lambda {|v| puts "test-kitchen: #{::TestKitchen::VERSION}"},
+        :exit => 0
+
       attr_accessor :runner
       attr_accessor :env
       attr_accessor :ui
@@ -91,7 +99,7 @@ module TestKitchen
       def runner
         @runner ||= begin
           # CLI option takes precedence, then project
-          runner_name = config[:runner] || env.project.runner || 'vagrant'
+          runner_name = config[:runner] || env.project.runner || env.default_runner
           runner_class = TestKitchen::Runner.targets[runner_name]
           runner = runner_class.new(env, config)
         end
@@ -257,6 +265,12 @@ module TestKitchen
 
       def print_help_and_exit(exitcode=1, fatal_message=nil)
         $stderr.puts(fatal_message) if fatal_message
+
+        begin
+          self.parse_options
+        rescue OptionParser::InvalidOption => e
+            puts "#{e}\n"
+        end
         puts self.opt_parser
         puts
         TestKitchen::CLI::Kitchen.list_commands

data/lib/test-kitchen/dsl.rb

@@ -15,10 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 require 'hashr'
 require 'test-kitchen/project'
 require 'test-kitchen/platform'
+require 'test-kitchen/runner/openstack/dsl'
 
 module TestKitchen
   module DSL
@@ -31,6 +31,10 @@ module TestKitchen
       def platform(name, &block)
         env.platforms[name.to_s] = Platform.new(name, &block)
       end
+
+      def default_runner(name)
+        env.default_runner = name
+      end
     end
     module CookbookDSL
       def cookbook(name, &block)

data/lib/test-kitchen/environment.rb

@@ -32,6 +32,7 @@ module TestKitchen
     attr_reader :ui
     attr_reader :kitchenfile_name
     attr_accessor :project
+    attr_accessor :default_runner
 
     KITCHEN_SUBDIRS = [".", "kitchen", "test/kitchen"]
 
@@ -47,6 +48,7 @@ module TestKitchen
         @project = Project::Cookbook.new(File.basename(Dir.pwd))
       end
 
+      @default_runner = "vagrant"
       @tmp_path = root_path.join('.kitchen')
       @cache_path = tmp_path.join('.cache')
       @ui = options[:ui]

data/lib/test-kitchen/platform.rb

@@ -41,6 +41,8 @@ module TestKitchen
       include Chef::Mixin::ParamsValidate
 
       attr_reader :name
+
+      # Virtual Box Specific Attributes
       attr_writer :box, :box_url
 
       def initialize(name, &block)
@@ -49,6 +51,20 @@ module TestKitchen
         instance_eval(&block) if block_given?
       end
 
+      OPENSTACK_OPTIONS = {
+        :image_id => nil, :flavor_id => nil, :install_chef => false,
+        :install_chef_cmd =>  "curl -L http://www.opscode.com/chef/install.sh | sudo bash",
+        :keyname => nil, :instance_name => nil, :ssh_user => "root", :ssh_key => nil}
+
+      OPENSTACK_OPTIONS.each do |option, default|
+        attr_writer option
+        define_method(option) do |*args|
+          arg = args.first
+          set_or_return(option, arg, default.nil? ? {} : {:default => default})
+        end
+      end
+
+
       def box(arg=nil)
         set_or_return(:box, arg, {})
       end

data/lib/test-kitchen/project/base.rb

@@ -78,7 +78,7 @@ module TestKitchen
       end
 
       def runner(arg=nil)
-        set_or_return(:runner, arg, :default => 'vagrant')
+        set_or_return(:runner, arg, nil)
       end
 
       def language(arg=nil)

data/lib/test-kitchen/runner/base.rb

@@ -143,6 +143,8 @@ module TestKitchen
       desired_platform = env.all_platforms[options[:platform]]
       if desired_platform.box_url
         TestKitchen::Runner.targets['vagrant'].new(env, options)
+      elsif desired_platform.image_id
+        TestKitchen::Runner.targets['openstack'].new(env, options)
       else
         raise ArgumentError,
           "No runner available for platform: #{desired_platform.name}"

data/lib/test-kitchen/runner/openstack/dsl.rb

@@ -0,0 +1,39 @@
+require 'test-kitchen/runner/openstack/environment'
+
+module TestKitchen
+  class Openstack
+    include Chef::Mixin::ParamsValidate
+
+    attr_writer :username, :password, :tenant, :auth_url
+
+    def initialize(&block)
+      instance_eval(&block) if block_given?
+    end
+
+    def username(arg=nil)
+      set_or_return(:username, arg, {})
+    end
+
+    def password(arg=nil)
+      set_or_return(:password, arg, {})
+    end
+
+    def tenant(arg=nil)
+      set_or_return(:tenant, arg, {})
+    end
+
+    def auth_url(arg=nil)
+      set_or_return(:auth_url, arg, {})
+    end
+  end
+end
+
+module TestKitchen
+  module DSL
+    module BasicDSL
+      def openstack(&block)
+        TestKitchen::Environment::Openstack.config = TestKitchen::Openstack.new(&block)
+      end
+    end
+  end
+end

data/lib/test-kitchen/runner/openstack/environment.rb

@@ -0,0 +1,141 @@
+require 'test-kitchen/environment'
+require 'json'
+require 'fog'
+
+module TestKitchen
+  class Environment
+    class Openstack < TestKitchen::Environment
+      attr_reader :username, :password, :tenant, :auth_url
+      attr_reader :servers
+
+      def initialize(conf={})
+        super
+        @username = conf[:username] || config.username
+        @password = conf[:password] || config.password
+        @tenant = conf[:tenant] || config.tenant
+        @auth_url = conf[:auth_url] || config.auth_url
+        @servers = {}
+        load
+      end
+
+      def create_server(platform_name, server_def)
+        @servers[platform_name] ||=
+          begin
+            server = connection.servers.create({ :name => server_def[:instance_name],
+                                                 :image_ref => server_def[:image_id],
+                                                 :flavor_ref => server_def[:flavor_id],
+                                                 :key_name => server_def[:keyname]})
+            server.wait_for { ready? }
+            sleep(2) until tcp_test_ssh(server.public_ip_address['addr'])
+            save
+            server
+          end
+
+        # These won't persist on the fog objectso we have to set them every
+        # time. :(
+        @servers[platform_name].username = server_def[:ssh_user]
+        if server_def[:ssh_key]
+          @servers[platform_name].private_key_path = File.expand_path(server_def[:ssh_key])
+        end
+        @servers[platform_name]
+      end
+
+      def tcp_test_ssh(hostname)
+        tcp_socket = TCPSocket.new(hostname, '22')
+        IO.select([tcp_socket], nil, nil, 5)
+      rescue SocketError, Errno::ETIMEDOUT, Errno::EPERM,
+        Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH
+        false
+      ensure
+        tcp_socket && tcp_socket.close
+      end
+
+      def connection
+        @connection ||= Fog::Compute.new(:provider => 'OpenStack',
+                                         :openstack_username => username,
+                                         :openstack_api_key => password,
+                                         :openstack_auth_url => auth_url,
+                                         :openstack_tenant => tenant)
+      end
+
+
+      # The following functions all take a name of
+      # of a VM in our enironment
+
+      def status(name)
+        if @servers.has_key?(name)
+          @servers[name].state.to_s.downcase
+        else
+          "not created"
+        end
+      end
+
+      def destroy(name)
+        @servers[name].destroy if @servers.has_key?(name)
+        @servers.delete(name)
+        save
+      end
+
+
+      # Ideally we could use the #ssh and #scp functions on Fog's server '
+      # object.  But these seem to be broken in the case of Openstack
+
+      def ssh_options(name)
+        if key = @servers[name].private_key_path
+          {:keys => [key]}
+        else
+          {}
+        end
+      end
+
+      def ssh(name)
+        server = @servers[name]
+        Fog::SSH.new(server.public_ip_address['addr'], server.username, ssh_options(name))
+      end
+
+      def scp(name)
+        server = @servers[name]
+        Fog::SCP.new(server.public_ip_address['addr'], server.username, ssh_options(name))
+      end
+
+      # GROSS: Global config as a class variable
+      def config
+        @@config
+      end
+
+      def self.config
+        @@config
+      end
+
+      def self.config=(config)
+        @@config = config
+      end
+
+      private
+
+      # Store state in .openstack_state file,
+      # allowing us to re-use already created VMs
+
+      def state_file
+        File.join(root_path, ".openstack_state")
+      end
+
+      def load
+        if File.exists?(state_file)
+          state = JSON.parse(File.read(state_file))
+          state.each do |platform, id|
+            @servers[platform] = connection.servers.get(id)
+          end
+        end
+      end
+
+      def save
+        state = {}
+        @servers.each {|k,s| state[k] = s.id}
+        File.open(state_file, 'w') do |f|
+          f.write(state.to_json)
+        end
+      end
+    end
+  end
+end

data/lib/test-kitchen/runner/openstack.rb

@@ -0,0 +1,147 @@
+#
+# Author:: Steven Danna (<steve@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# 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.
+#
+
+require 'fog'
+require 'test-kitchen/runner/openstack/environment'
+
+module TestKitchen
+  module Runner
+    class Openstack < Base
+
+
+      # @vm: The TestKitchen::Platform::Version object
+      #
+      # @platform: From the parent constructor, contains the full name
+      # of the relevant platform if we were created by #for_platform
+
+      attr_accessor :vm
+
+      def initialize(env, options={})
+        super
+
+        if @platform
+          @vm = env.all_platforms[@platform]
+        end
+
+        @os_env = TestKitchen::Environment::Openstack.new()
+      end
+
+      def create
+        env.ui.msg "[#{platform}] Provisioning guest on Openstack", :green
+        @os_env.create_server(@platform,
+                              { :instance_name => (vm.instance_name || "cookbook-tester-#{platform}"),
+                                :image_id => vm.image_id,
+                                :flavor_id => vm.flavor_id,
+                                :keyname => vm.keyname,
+                                :ssh_key => vm.ssh_key,
+                                :ssh_user => vm.ssh_user})
+
+      end
+
+      def converge
+        install_chef if vm.install_chef
+        move_repo
+        move_cookbooks
+        run_chef_solo
+      end
+
+      # status and destroy are expected to operate on all
+      # vm's in an environment
+      def status
+        env.all_platforms.each do |name, ver|
+          env.ui.msg "#{name}\t#{@os_env.status(name)}"
+        end
+      end
+
+      def destroy
+        env.all_platforms.each do |name, platform|
+          env.ui.msg "[#{name}] Terminating openstack server", :yellow
+          @os_env.destroy name
+        end
+      end
+
+      def execute_remote_command(platform_name, command, message=nil)
+        env.ui.msg("[#{platform_name}] #{message}", :green) if message
+        results = @os_env.ssh(platform_name).run(command) do |data|
+          stdout, stderr = data.map {|s| s.rstrip}
+          stdout.lines.each do |line|
+            env.ui.msg "[#{platform_name}] #{line}", :green
+          end
+          stderr.lines.each do |line|
+            env.ui.msg "[#{platform_name}] #{line}", :red
+          end
+        end
+        if results.first.status != 0
+          msg = message || "Remote command"
+          env.ui.msg "[#{platform_name}] #{msg} failed!", :red
+        end
+      end
+
+      private
+
+      def install_chef(name=platform)
+        execute_remote_command(name, vm.install_chef_cmd, "Installing Chef")
+      end
+
+      def run_chef_solo(name=platform)
+        execute_remote_command(name, "echo '#{json_for_node}' > node.json",
+                               "Creating node configuration JSON")
+        execute_remote_command(name, "echo 'cookbook_path [ \"#{remote_cookbook_dir}\" ]' > solo.rb",
+                               "Creating chef-solo configuration")
+        execute_remote_command(name, "sudo chef-solo -j node.json -c solo.rb",
+                               "Running chef-solo on host")
+      end
+
+      def move_cookbooks(name=platform)
+        env.ui.msg("[#{name}] Moving cookbooks via SCP", :green)
+        @os_env.scp(name).upload(File.join(env.tmp_path, "cookbooks"),
+                                 remote_cookbook_dir, :recursive => true)
+      end
+
+      def move_repo(name=platform)
+        env.ui.msg("[#{name}] Moving repo via SCP", :green)
+        execute_remote_command(name, "sudo mkdir -p #{remote_root_dir}")
+        execute_remote_command(name, "sudo chown #{vm.ssh_user} #{remote_root_dir}")
+        @os_env.scp(name).upload(File.join(env.tmp_path, "cookbook_under_test"),
+                                 configuration.guest_source_root,
+                                 {:recursive => true})
+      end
+
+      def json_for_node
+        {
+          'test-kitchen' => {
+            'project' => configuration.to_hash.merge('source_root' => configuration.guest_source_root,
+                                                     'test_root' => configuration.guest_test_root)},
+          'run_list' => run_list
+        }.to_json
+      end
+
+      def run_list
+        configuration.run_list + [test_recipe_name]
+      end
+
+      def remote_root_dir
+        File.dirname(configuration.guest_source_root)
+      end
+
+      def remote_cookbook_dir
+        File.join(remote_root_dir, 'cookbooks')
+      end
+    end
+  end
+end

data/lib/test-kitchen/runner.rb

@@ -18,3 +18,4 @@
 
 require 'test-kitchen/runner/base'
 require 'test-kitchen/runner/vagrant'
+require 'test-kitchen/runner/openstack'

data/lib/test-kitchen/scaffold.rb

@@ -42,7 +42,7 @@ module TestKitchen
       scaffold_file 'test/kitchen/Kitchenfile',
         <<-eos
           #{project_type(output_dir)} "#{project_name(output_dir)}" do
-            #{'runtimes []' if project_type(output_dir) == 'cookbook'}
+
           end
         eos
     end

data/lib/test-kitchen/version.rb

@@ -17,5 +17,5 @@
 #
 
 module TestKitchen
-  VERSION = "0.6.0"
+  VERSION = "0.7.0.beta.1"
 end

metadata

@@ -1,32 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foodcritic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +177,9 @@ files:
 - lib/test-kitchen/project/supported_platforms.rb
 - lib/test-kitchen/project.rb
 - lib/test-kitchen/runner/base.rb
+- lib/test-kitchen/runner/openstack/dsl.rb
+- lib/test-kitchen/runner/openstack/environment.rb
+- lib/test-kitchen/runner/openstack.rb
 - lib/test-kitchen/runner/vagrant.rb
 - lib/test-kitchen/runner.rb
 - lib/test-kitchen/scaffold.rb
@@ -183,9 +202,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23