jamie 0.1.0.beta3 → 0.1.0.beta4

data/Gemfile

@@ -10,5 +10,4 @@ end
 
 group :test do
   gem 'rake', '~> 0.9'
-  gem 'pry'
 end

data/Rakefile

@@ -7,7 +7,7 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => [ :test ]
+task :default => [:test]
 
 unless RUBY_ENGINE == 'jruby'
   require 'cane/rake_task'
@@ -29,9 +29,17 @@ unless RUBY_ENGINE == 'jruby'
     )
   end
 
-  Tailor::RakeTask.new
+  Tailor::RakeTask.new do |task|
+    task.file_set('bin/*', 'binaries')
+    task.file_set('lib/**/*.rb', 'code') do |style|
+      # TODO: Tailor is confused thinking `module Jamie` is a class. Until
+      # the classes are split in seperate files, let's punt on this
+      style.max_code_lines_in_class 1550, level: :warn
+    end
+    task.file_set('spec/**/*.rb', 'tests')
+  end
 
-  Rake::Task[:default].enhance [ :cane, :tailor ]
+  Rake::Task[:default].enhance [:cane, :tailor]
 end
 
 desc "Display LOC stats"
@@ -42,4 +50,4 @@ task :stats do
   sh "countloc -r spec"
 end
 
-Rake::Task[:default].enhance [ :stats ]
+Rake::Task[:default].enhance [:stats]

data/jamie.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'celluloid'
   gem.add_dependency 'thor'
+  gem.add_dependency 'pry'
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-scp'
   gem.add_dependency 'mixlib-shellout'

data/lib/jamie.rb

@@ -164,7 +164,7 @@ module Jamie
     def log_level
       @log_level ||= begin
         ENV['JAMIE_LOG'] && ENV['JAMIE_LOG'].downcase.to_sym ||
-        Jamie::DEFAULT_LOG_LEVEL
+          Jamie::DEFAULT_LOG_LEVEL
       end
     end
 
@@ -286,7 +286,7 @@ module Jamie
     def platform_driver_hash(platform_name)
       h = yaml[:platforms].find { |p| p[:name] == platform_name } || Hash.new
 
-      h.select { |key, value| [ :driver_plugin, :driver_config ].include?(key) }
+      h.select { |key, value| [:driver_plugin, :driver_config].include?(key) }
     end
 
     def new_instance_logger(index)
@@ -355,7 +355,7 @@ module Jamie
 
     def common_driver_hash
       yaml.select do |key, value|
-        [ :driver_plugin, :driver_config ].include?(key)
+        [:driver_plugin, :driver_config].include?(key)
       end
     end
   end
@@ -374,7 +374,7 @@ module Jamie
 
     COLORS = %w(
       cyan yellow green magenta red blue bright_cyan bright_yellow
-      bright_green bright_magenta bright_red, bright_blue
+      bright_green bright_magenta bright_red bright_blue
     ).freeze
 
     def self.escape(name)
@@ -563,7 +563,7 @@ module Jamie
     private
 
     def validate_options(opts)
-      [ :name, :run_list ].each do |k|
+      [:name, :run_list].each do |k|
         raise ClientError, "Suite#new requires option :#{k}" if opts[k].nil?
       end
     end
@@ -604,7 +604,7 @@ module Jamie
     private
 
     def validate_options(opts)
-      [ :name ].each do |k|
+      [:name].each do |k|
         raise ClientError, "Platform#new requires option :#{k}" if opts[k].nil?
       end
     end
@@ -792,7 +792,7 @@ module Jamie
     private
 
     def validate_options(opts)
-      [ :suite, :platform, :driver, :jr, :logger ].each do |k|
+      [:suite, :platform, :driver, :jr, :logger].each do |k|
         raise ClientError, "Instance#new requires option :#{k}" if opts[k].nil?
       end
     end
@@ -838,7 +838,7 @@ module Jamie
       banner "#{output_verb} #{to_str}"
       elapsed = action(verb) { |state| driver.public_send(verb, state) }
       info("Finished #{output_verb.downcase} #{to_str}" +
-           " #{Util.duration(elapsed.real)}.")
+        " #{Util.duration(elapsed.real)}.")
       yield if block_given?
       Actor.current
     end
@@ -927,7 +927,7 @@ module Jamie
 
       private
 
-      TRANSITIONS = [ :destroy, :create, :converge, :setup, :verify ]
+      TRANSITIONS = [:destroy, :create, :converge, :setup, :verify]
 
       def self.index(transition)
         if transition.nil?
@@ -953,7 +953,7 @@ module Jamie
     # @param [Hash] opts optional configuration
     # @option opts [TrueClass, FalseClass] :use_sudo whether or not to invoke
     #   sudo before commands requiring root access (default: `true`)
-    def initialize(suite_name, opts = {:use_sudo => true})
+    def initialize(suite_name, opts = { :use_sudo => true })
       validate_options(suite_name)
 
       @suite_name = suite_name
@@ -972,7 +972,7 @@ module Jamie
       @setup_cmd ||= if local_suite_files.empty?
         nil
       else
-        <<-INSTALL_CMD.gsub(/ {10}/, '')
+        <<-INSTALL_CMD.gsub(/^ {10}/, '')
           #{sudo}#{ruby_bin} -e "$(cat <<"EOF"
           #{install_script}
           EOF
@@ -994,7 +994,7 @@ module Jamie
       @sync_cmd ||= if local_suite_files.empty?
         nil
       else
-        <<-INSTALL_CMD.gsub(/ {10}/, '')
+        <<-INSTALL_CMD.gsub(/^ {10}/, '')
           #{sudo}#{jr_bin} cleanup-suites
           #{local_suite_files.map { |f| stream_file(f, remote_file(f)) }.join}
         INSTALL_CMD
@@ -1053,7 +1053,7 @@ module Jamie
     def stream_file(local_path, remote_path)
       local_file = IO.read(local_path)
       md5 = Digest::MD5.hexdigest(local_file)
-      perms = sprintf("%o", File.stat(local_path).mode)[3,3]
+      perms = sprintf("%o", File.stat(local_path).mode)[3, 3]
       jr_stream_file = "#{jr_bin} stream-file #{remote_path} #{md5} #{perms}"
 
       <<-STREAMFILE.gsub(/^ {8}/, '')
@@ -1115,7 +1115,7 @@ module Jamie
 
     def self.symbolized_hash(obj)
       if obj.is_a?(Hash)
-        obj.inject({}) { |h, (k,v)| h[k.to_sym] = symbolized_hash(v) ; h }
+        obj.inject({}) { |h, (k, v)| h[k.to_sym] = symbolized_hash(v) ; h }
       elsif obj.is_a?(Array)
         obj.inject([]) { |a, v| a << symbolized_hash(v) ; a }
       else
@@ -1126,7 +1126,7 @@ module Jamie
     def self.duration(total)
       minutes = (total / 60).to_i
       seconds = (total - (minutes * 60))
-      "(%dm%.2fs)" % [ minutes, seconds ]
+      "(%dm%.2fs)" % [minutes, seconds]
     end
   end
 
@@ -1316,7 +1316,7 @@ module Jamie
             end
           end
         end
-        @validations << [ attr, block ]
+        @validations << [attr, block]
       end
 
       def self.no_parallel_for(*methods)
@@ -1391,7 +1391,7 @@ module Jamie
         opts[:password] = config[:password] if config[:password]
         opts[:keys] = Array(config[:ssh_key]) if config[:ssh_key]
 
-        [ state[:hostname], config[:username], opts ]
+        [state[:hostname], config[:username], opts]
       end
 
       def chef_home
@@ -1475,7 +1475,7 @@ module Jamie
         socket = TCPSocket.new(hostname, config[:port])
         IO.select([socket], nil, nil, 5)
       rescue SocketError, Errno::ECONNREFUSED,
-          Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
+        Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
         sleep 2
         false
       rescue Errno::EPERM, Errno::ETIMEDOUT
@@ -1546,8 +1546,9 @@ module Jamie
     end
 
     def upload_path(scp, path, dir = File.basename(path))
-      scp.upload!(path, "#{chef_home}/#{dir}", :recursive => true
-      ) do |ch, name, sent, total|
+      dest = "#{chef_home}/#{dir}"
+
+      scp.upload!(path, dest, :recursive => true) do |ch, name, sent, total|
         if sent == total
           info("Uploaded #{name.sub(%r{^#{path}/}, '')} (#{total} bytes)")
         end
@@ -1593,7 +1594,8 @@ module Jamie
         fatal("#{name} must be installed, add it to your Gemfile.")
         raise UserError, "#{bin} command not found"
       end
-      run_command "#{bin} install --path #{tmpdir}"
+
+      Jamie.mutex.synchronize { run_command "#{bin} install --path #{tmpdir}" }
     end
 
     def cp_cookbooks(tmpdir)
@@ -1628,7 +1630,7 @@ module Jamie
     #   attributes or nil values if they could not be determined
     def self.extract(metadata_file)
       mc = new(File.expand_path(metadata_file))
-      [ mc[:name], mc[:version] ]
+      [mc[:name], mc[:version]]
     end
 
     # Creates a new instances and loads in the contents of the metdata.rb

data/lib/jamie/cli.rb

@@ -47,10 +47,10 @@ module Jamie
     def list(*args)
       result = parse_subcommand(args.first)
       if options[:bare]
-        say Array(result).map{ |i| i.name }.join("\n")
+        say Array(result).map { |i| i.name }.join("\n")
       else
         table = [
-          [ set_color("Instance", :green), set_color("Last Action", :green) ]
+          [set_color("Instance", :green), set_color("Last Action", :green)]
         ]
         table += Array(result).map { |i| display_instance(i) }
         print_table(table)
@@ -107,7 +107,7 @@ module Jamie
       results = get_filtered_instances(regexp)
       if results.size > 1
         die task, "Argument `#{regexp}' returned multiple results:\n" +
-          results.map{ |i| "  * #{i.name}" }.join("\n")
+          results.map { |i| "  * #{i.name}" }.join("\n")
       end
       instance = results.pop
 
@@ -210,7 +210,7 @@ module Jamie
       when nil then set_color("<Not Created>", :red)
       else set_color("<Unknown>", :white)
       end
-      [ set_color(instance.name, :white), action ]
+      [set_color(instance.name, :white), action]
     end
 
     def die(task, msg)
@@ -220,18 +220,19 @@ module Jamie
     end
 
     def pry_prompts
-      [ proc { |target_self, nest_level, pry|
-          [ "[#{pry.input_array.size}] ",
+      [
+        proc { |target_self, nest_level, pry|
+          ["[#{pry.input_array.size}] ",
             "jc(#{Pry.view_clip(target_self.class)})",
             "#{":#{nest_level}" unless nest_level.zero?}> "
           ].join
         },
         proc { |target_self, nest_level, pry|
-          [ "[#{pry.input_array.size}] ",
+          ["[#{pry.input_array.size}] ",
             "jc(#{Pry.view_clip(target_self.class)})",
             "#{":#{nest_level}" unless nest_level.zero?}* "
           ].join
-        }
+        },
       ]
     end
   end
@@ -265,7 +266,7 @@ module Jamie
           puts ">>>>> Jamie gem not loaded, omitting tasks" unless ENV['CI']
         end
       THOR
-      empty_directory "test/integration/standard" if init_test_dir?
+      empty_directory "test/integration/default" if init_test_dir?
       append_to_gitignore(".jamie/")
       append_to_gitignore(".jamie.local.yml")
       add_plugins
@@ -277,7 +278,7 @@ module Jamie
       url_base = "https://opscode-vm.s3.amazonaws.com/vagrant/boxes"
       platforms = [
         { :n => 'ubuntu', :vers => %w(12.04 10.04), :rl => "recipe[apt]" },
-        { :n => 'centos', :vers => %w(6.3 5.8), :rl => "recipe[yum::epel]" }
+        { :n => 'centos', :vers => %w(6.3 5.8), :rl => "recipe[yum::epel]" },
       ]
       platforms = platforms.map do |p|
         p[:vers].map do |v|
@@ -296,15 +297,14 @@ module Jamie
         nil
       end
       run_list = cookbook_name ? "recipe[#{cookbook_name}]" : nil
-      attributes = cookbook_name ? { cookbook_name => nil } : nil
 
       { 'driver_plugin' => 'vagrant',
         'platforms' => platforms,
         'suites' => [
-          { 'name' => 'standard',
+          { 'name' => 'default',
             'run_list' => Array(run_list),
-            'attributes' => attributes
-          }
+            'attributes' => Hash.new
+          },
         ]
       }.to_yaml
     end
@@ -345,7 +345,7 @@ module Jamie
 
     def list_plugins
       specs = fetch_gem_specs.map { |t| t.first }.map { |t| t[0, 2] }.
-        sort { |x,y| x[0] <=> y[0] }
+        sort { |x, y| x[0] <=> y[0] }
       specs = specs[0, 49].push(["...", "..."]) if specs.size > 49
       specs = specs.unshift(["Gem Name", "Latest Stable Release"])
       print_table(specs, :indent => 4)

data/lib/jamie/driver/dummy.rb

@@ -55,14 +55,22 @@ module Jamie
       private
 
       def report(action, state)
-        info("[Dummy] Action ##{action} called on " +
-          "instance=#{instance} with state=#{state}")
+        what = action.capitalize
+        info("[Dummy] #{what} on instance=#{instance} with state=#{state}")
+        sleep_if_set
+        random_failure_if_set
+        debug("[Dummy] #{what} completed (#{config[:sleep]}s).")
+      end
+
+      def sleep_if_set
         sleep(config[:sleep].to_f) if config[:sleep].to_f > 0.0
+      end
+
+      def random_failure_if_set
         if config[:random_failure] && [true, false].sample
           debug("[Dummy] Random failure for action ##{action}.")
           raise ActionFailed, "Action ##{action} failed for #{instance.to_str}."
         end
-        debug("[Dummy] Action ##{action} completed (#{config[:sleep]}s).")
       end
     end
   end

data/lib/jamie/thor_tasks.rb

@@ -55,7 +55,7 @@ module Jamie
 
       self.class.desc "all", "Run all test instances"
       self.class.send(:define_method, :all) do
-        config.instances.each { |i| invoke i.name.gsub(/-/, '_')  }
+        config.instances.each { |i| invoke i.name.gsub(/-/, '_') }
       end
     end
   end

data/lib/jamie/version.rb

@@ -18,5 +18,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.beta3"
+  VERSION = "0.1.0.beta4"
 end

data/spec/jamie/config/collection_spec.rb

@@ -0,0 +1,77 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, Fletcher Nichol
+#
+# 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_relative '../../spec_helper'
+
+describe Jamie::Config::Collection do
+
+  let(:collection) do
+    Jamie::Config::Collection.new([
+      obj('one'), obj('two', 'a'), obj('two', 'b'), obj('three')
+    ])
+  end
+
+  it "transparently wraps an Array" do
+    collection.must_be_instance_of Array
+  end
+
+  describe "#get" do
+
+    it "returns a single object by its name" do
+      collection.get('three').must_equal obj('three')
+    end
+
+    it "returns the first occurance of an object by its name" do
+      collection.get('two').must_equal obj('two', 'a')
+    end
+
+    it "returns nil if an object cannot be found by its name" do
+      collection.get('nope').must_be_nil
+    end
+  end
+
+  describe "#get_all" do
+
+    it "returns a Collection of objects whose name matches the regex" do
+      result = collection.get_all(/(one|three)/)
+      result.size.must_equal 2
+      result[0].must_equal obj('one')
+      result[1].must_equal obj('three')
+      result.get_all(/one/).size.must_equal 1
+    end
+
+    it "returns an empty Collection if on matches are found" do
+      result = collection.get_all(/noppa/)
+      result.must_equal []
+      result.get("nahuh").must_be_nil
+    end
+  end
+
+  describe "#as_name" do
+
+    it "returns an Array of names as strings" do
+      collection.as_names.must_equal %w{one two two three}
+    end
+  end
+
+  private
+
+  def obj(name, extra = nil)
+    OpenStruct.new(:name => name, :extra => extra)
+  end
+end