jamie 0.1.0.alpha4 → 0.1.0.alpha5

data/Rakefile

@@ -9,10 +9,10 @@ Cane::RakeTask.new do |cane|
     Jamie::Vagrant.define_vagrant_vm
   )
   cane.style_exclude = %w(
-    lib/jamie/core_ext.rb
+    lib/vendor/hash_recursive_merge.rb
   )
   cane.doc_exclude = %w(
-    lib/jamie/core_ext.rb
+    lib/vendor/hash_recursive_merge.rb
   )
 end
 

data/bin/jamie

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
+$:.unshift File.join(File.dirname(__FILE__), %w{.. lib})
+require 'jamie/cli'
+
+Jamie::CLI.start

data/jamie.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = %w(jamie)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'thor'
   gem.add_dependency 'mixlib-shellout'
   gem.add_dependency 'vagrant', '~> 1.0.5'
 

data/lib/jamie/cli.rb

@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*-
+
+require 'thor'
+
+require 'jamie'
+
+module Jamie
+
+  # The command line runner for Jamie.
+  class CLI < Thor
+
+    # Constructs a new instance.
+    def initialize(*args)
+      super
+      @config = Jamie::Config.new(ENV['JAMIE_YAML'])
+    end
+
+    desc "list", "List all instances"
+    def list
+      say @config.instances.as_names.join("\n")
+    end
+
+    [:create, :converge, :setup, :verify, :test, :destroy].each do |action|
+      desc(
+        "#{action} (all ['REGEX']|[INSTANCE])",
+        "#{action.capitalize} one or more instances"
+      )
+      define_method(action) { |*args| exec_action(action) }
+    end
+
+    private
+
+    attr_reader :task
+
+    def exec_action(action)
+      @task = action
+      result = parse_subcommand(args[0], args[1])
+      Array(result).each { |instance| instance.send(task) }
+    end
+
+    def parse_subcommand(name_or_all, regexp)
+      if name_or_all.nil? || (name_or_all == "all" && regexp.nil?)
+        get_all_instances
+      elsif name_or_all == "all" && regexp
+        get_filtered_instances(regexp)
+      elsif name_or_all != "all" && regexp.nil?
+        get_instance(name_or_all)
+      else
+        die task, "Invalid invocation."
+      end
+    end
+
+    def get_all_instances
+      result = @config.instances
+      if result.empty?
+        die task, "No instances defined"
+      else
+        result
+      end
+    end
+
+    def get_filtered_instances(regexp)
+      result = @config.instances.get_all(/#{regexp}/)
+      if result.empty?
+        die task, "No instances for regex `#{regexp}', try running `jamie list'"
+      else
+        result
+      end
+    end
+
+    def get_instance(name)
+      result = @config.instances.get(name)
+      if result.nil?
+        die task, "No instance `#{name}', try running `jamie list'"
+      end
+      result
+    end
+
+    def die(task, msg)
+      error "\n#{msg}\n\n"
+      help(task)
+      exit 1
+    end
+  end
+end

data/lib/jamie/version.rb

@@ -2,5 +2,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha4"
+  VERSION = "0.1.0.alpha5"
 end

data/lib/jamie.rb

@@ -1,11 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 require 'base64'
+require 'delegate'
 require 'digest'
 require 'net/https'
 require 'yaml'
+require 'vendor/hash_recursive_merge'
 
-require 'jamie/core_ext'
 require 'jamie/version'
 
 module Jamie
@@ -42,21 +43,23 @@ module Jamie
     # @return [Array<Platform>] all defined platforms which will be used in
     #   convergence integration
     def platforms
-      @platforms ||= Array(yaml["platforms"]).map { |hash| new_platform(hash) }
+      @platforms ||= Collection.new(
+        Array(yaml["platforms"]).map { |hash| new_platform(hash) })
     end
 
     # @return [Array<Suite>] all defined suites which will be used in
     #   convergence integration
     def suites
-      @suites ||= Array(yaml["suites"]).map { |hash| Suite.new(hash) }
+      @suites ||= Collection.new(
+        Array(yaml["suites"]).map { |hash| Suite.new(hash) })
     end
 
     # @return [Array<Instance>] all instances, resulting from all platform and
     #   suite combinations
     def instances
-      @instances ||= suites.map { |suite|
+      @instances ||= Collection.new(suites.map { |suite|
         platforms.map { |platform| Instance.new(suite, platform) }
-      }.flatten
+      }.flatten)
     end
 
     # @return [String] path to the Jamie YAML file
@@ -75,6 +78,39 @@ module Jamie
       @test_base_path ||= DEFAULT_TEST_BASE_PATH
     end
 
+    # Delegate class which adds the ability to find single and multiple
+    # objects by their #name in an Array. Hey, it's better than monkey-patching
+    # Array, right?
+    class Collection < SimpleDelegator
+
+      # Returns a single object by its name, or nil if none are found.
+      #
+      # @param name [String] name of object
+      # @return [Object] first match by name, or nil if none are found
+      def get(name)
+        __getobj__.find { |i| i.name == name }
+      end
+
+      # Returns a Collection of all objects whose #name is matched by the
+      # regular expression.
+      #
+      # @param regexp [Regexp] a regular expression pattern
+      # @return [Jamie::Config::Collection<Object>] a new collection of
+      #   matched objects
+      def get_all(regexp)
+        Jamie::Config::Collection.new(
+          __getobj__.find_all { |i| i.name =~ regexp }
+        )
+      end
+
+      # Returns an Array of names from the collection as strings.
+      #
+      # @return [Array<String>] array of name strings
+      def as_names
+        __getobj__.map { |i| i.name }
+      end
+    end
+
     private
 
     def new_platform(hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha4
+  version: 0.1.0.alpha5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +126,8 @@ dependencies:
 description: A Chef convergence integration test harness
 email:
 - fnichol@nichol.ca
-executables: []
+executables:
+- jamie
 extensions: []
 extra_rdoc_files: []
 files:
@@ -121,13 +138,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/jamie
 - jamie.gemspec
 - lib/jamie.rb
-- lib/jamie/core_ext.rb
+- lib/jamie/cli.rb
 - lib/jamie/driver/vagrant.rb
 - lib/jamie/rake_tasks.rb
 - lib/jamie/vagrant.rb
 - lib/jamie/version.rb
+- lib/vendor/hash_recursive_merge.rb
 homepage: ''
 licenses: []
 post_install_message: