linecook 1.1.0 → 1.2.0

data/History

@@ -1,3 +1,10 @@
+== 1.2.0 2011/05/23
+
+* updated to run on 1.9.2, jruby
+* allow build of recipes without a package file
+* added Recipe#close! to unregister a recipe from a package
+* allow .yml,.yaml,.json attributes files
+
 == 1.1.0 2011/05/02
 
 * updated scaffold generated by 'linecook init' to be current and simpler

data/lib/linecook/commands/build.rb

@@ -19,17 +19,17 @@ module Linecook
         sources = {}
         helpers = []
         
-        Dir.glob("#{helpers_dir}/*/**/*").each do |source|
-          next if File.directory?(source)
-          (sources[File.dirname(source)] ||= []) << source
+        Dir.glob("#{helpers_dir}/*/**/*").each do |source_file|
+          next if File.directory?(source_file)
+          (sources[File.dirname(source_file)] ||= []) << source_file
         end
         
-        sources.each_pair do |dir, sources|
+        sources.each_pair do |dir, source_files|
           name = dir[(helpers_dir.length + 1)..-1]
-          helpers << [name, sources]
+          helpers << [name, source_files]
         end
         
-        helpers.sort_by {|name, sources| name }
+        helpers.sort_by {|name, source_files| name }
       end
       
       def glob_package_files(package_names)

data/lib/linecook/commands/helper.rb

@@ -211,7 +211,7 @@ module Linecook
           compiler = ERB::Compiler.new('<>')
           compiler.put_cmd = "write"
           compiler.insert_cmd = "write"
-          code = compiler.compile(body)
+          code = [compiler.compile(body)].flatten.first
           
           "#{source}\n#{code}".gsub(/^(\s*)/) do |m| 
             indent = 2 + $1.length - ($1.length % 2)
@@ -274,11 +274,11 @@ DOC
       DEFINITION_TEMPLATE_LINE = __LINE__ + 2
       DEFINITION_TEMPLATE = ERB.new(<<-DOC, nil, '<>').src
 <%= sections['head'] %>
-<% definitions.each do |desc, method_name, signature, body| %>
+<% definitions.each do |desc, method_name, signature, method_body| %>
 <% desc.split("\n").each do |line| %>
 # <%= line %><% end %>
 def <%= method_name %><%= signature %>
-<%= body %>
+<%= method_body %>
 
   chain_proxy
 end

data/lib/linecook/commands/init.rb

@@ -46,7 +46,7 @@ module Linecook
         context = OpenStruct.new(
           :project_name => project_name,
           :const_name => Utils.camelize(project_name)
-        ).send(:binding)
+        ).instance_eval('binding')
         
         #
         # Copy template files into place

data/lib/linecook/commands/state.rb

@@ -12,14 +12,14 @@ module Linecook
       config :hosts, false, :short => :n, &c.flag   # print state by host
       
       def state(vm_name)
-        running?(vm_name) ? "running" : "stopped"
+        `VBoxManage showvminfo #{vm_name}` =~ /^State:\s+(.*)$/ ? $1 : 'unknown'
       end
       
       def process(*hosts)
         vm_names = resolve_vm_names(hosts)
         if hosts
           each_host(vm_names) do |host|
-            puts "#{host}: #{state(host_map[host])}"
+            puts "#{host}: #{state(host_map[host] || host)}"
           end
         else
           each_vm_name(vm_names) do |vm_name|

data/lib/linecook/commands/vbox_command.rb

@@ -57,7 +57,7 @@ module Linecook
       end
       
       def resolve_vm_names(hosts)
-        names ? hosts : hosts.collect {|host| host_map[host] }
+        names ? hosts : hosts.collect {|host| host_map[host] || host }
       end
       
       def each_host(hosts=[])

data/lib/linecook/package.rb

@@ -197,14 +197,29 @@ module Linecook
       resource_path('recipes', recipe_name)
     end
     
-    # Loads the attributes file with the specified name and evaluates in the
-    # context of Attributes.  Returns the new Attributes object.
+    # Loads the named attributes file into and returns an instance of
+    # Attributes. The loading mechanism depends on the attributes file
+    # extname.
+    #
+    #   .rb: evaluate in the context of attributes
+    #   .yml,.yaml,.json: load as YAML and merge into attributes
+    #
+    # All other file types raise an error.  Simply returns a new Attributes
+    # instance if no name is given.
     def load_attributes(attributes_name=nil)
       attributes = Attributes.new
       
       if attributes_name
         path = attributes_path(attributes_name)
-        attributes.instance_eval(File.read(path), path)
+        
+        case File.extname(path)
+        when '.rb'
+          attributes.instance_eval(File.read(path), path)
+        when '.yml', '.yaml', '.json'
+          attributes.attrs.merge!(YAML.load_file(path))
+        else
+          raise "invalid attributes format: #{path.inspect}"
+        end
       end
       
       attributes

data/lib/linecook/recipe.rb

@@ -81,6 +81,13 @@ module Linecook
       self
     end
     
+    # Closes _target_ and returns self, and unregisters _target_ from the
+    # package.  Useful for recipes that only generate other files.
+    def close!
+      _package_.registry.delete _target_name_
+      close
+    end
+    
     # Returns true if _target_ is closed.
     def closed?
       _target_.closed?

data/lib/linecook/template.rb

@@ -11,7 +11,7 @@ module Linecook
     end
     
     def build(locals={})
-      erb.result OpenStruct.new(locals).send(:binding)
+      erb.result OpenStruct.new(locals).instance_eval('binding')
     end
   end
 end

data/lib/linecook/test/file_test.rb

@@ -1,3 +1,5 @@
+require 'linecook/test/shim'
+
 module Linecook
   module Test
     module FileTest

data/lib/linecook/test/shell_test.rb

@@ -1,5 +1,6 @@
 require 'linecook/test/regexp_escape'
 require 'linecook/test/command_parser'
+require 'linecook/test/shim'
 
 module Linecook
   module Test

data/lib/linecook/test/shim.rb

@@ -0,0 +1,71 @@
+require 'test/unit'
+
+if Object.const_defined?(:MiniTest)
+  ################################
+  # MiniTest shims (ruby 1.9)
+  ################################
+  
+  class Test::Unit::TestCase
+    class << self
+      # Causes a test suite to be skipped.  If a message is given, it will
+      # print and notify the user the test suite has been skipped.
+      def skip_test(msg=nil)
+        @@test_suites.delete(self)
+        puts "Skipping #{self}#{msg.empty? ? '' : ': ' + msg}"
+      end
+    end
+  end
+  
+  # MiniTest renames method_name as name.  For backwards compatibility it must
+  # be added back.
+  class MiniTest::Unit::TestCase
+    def method_name
+      __name__
+    end
+  end
+  
+else
+  ################################
+  # Test::Unit shims (< ruby 1.9)
+  ################################
+  # :stopdoc:
+  # Implementing skip_test in the original Test::Unit is considerably more
+  # tricky than in the Mini::Test Test::Unit.
+  class Test::Unit::TestCase
+    class << self
+      alias tap_original_test_case_inherited inherited
+    
+      def inherited(child)
+        super
+        tap_original_test_case_inherited(child)
+        child.instance_variable_set(:@skip_messages, [])
+        child.instance_variable_set(:@run_test_suite, true)
+      end
+    
+      # Causes a test suite to be skipped.  If a message is given, it will
+      # print and notify the user the test suite has been skipped.
+      def skip_test(msg=nil)
+        @run_test_suite = false
+        @skip_messages << msg
+      end
+    
+      alias :original_suite :suite
+
+      # Modifies the default suite method to skip the suit unless
+      # run_test_suite is true.  If the test is skipped, the skip_messages 
+      # will be printed along with the default 'Skipping <Test>' message.
+      def suite # :nodoc:
+        if @run_test_suite
+          original_suite
+        else
+          skip_message = @skip_messages.compact.join(', ')
+          puts "Skipping #{name}#{skip_message.empty? ? '' : ': ' + skip_message}"
+
+          # return an empty test suite of the appropriate name
+          Test::Unit::TestSuite.new(name)
+        end
+      end
+    end
+  end
+  # :startdoc:
+end

data/lib/linecook/test.rb

@@ -18,39 +18,10 @@ module Linecook
           pattern.kind_of?(Regexp) ? pattern : /\A#{pattern}\z/
         end
         
-        @skip_test_suite = false
         unless patterns.any? {|pattern| host =~ pattern }
           skip_test "not for host (#{host})"
         end
       end
-      
-      # Causes a test suite to be skipped.  If a message is given, it will
-      # print and notify the user the test suite has been skipped.
-      def skip_test(msg=nil)
-        @skip_test_suite = true
-        skip_messages << msg
-      end
-      
-      # Modifies the default suite method to skip the suit unless
-      # run_test_suite is true.  If the test is skipped, the skip_messages 
-      # will be printed along with the default 'Skipping <Test>' message.
-      def suite # :nodoc:
-        if (@skip_test_suite ||= false)
-          skip_message = skip_messages.compact.join(', ')
-          puts "Skipping #{name}#{skip_message.empty? ? '' : ': ' + skip_message}"
-
-          # return an empty test suite of the appropriate name
-          ::Test::Unit::TestSuite.new(name)
-        else
-          super
-        end
-      end
-      
-      protected
-      
-      def skip_messages # :nodoc:
-        @skip_messages ||= []
-      end
     end
   
     module ModuleMethods

data/lib/linecook/utils.rb

@@ -5,7 +5,7 @@ module Linecook
     module_function
     
     def load_config(path)
-      (path ? YAML.load_file(path) : nil) || {}
+      (path && File.exists?(path) ? YAML.load_file(path) : nil) || {}
     end
     
     def arrayify(obj)

data/lib/linecook/version.rb

@@ -1,6 +1,6 @@
 module Linecook
   MAJOR = 1
-  MINOR = 1
+  MINOR = 2
   TINY  = 0
   
   VERSION = "#{MAJOR}.#{MINOR}.#{TINY}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linecook
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -06:00
+date: 2011-05-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 59
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - lib/linecook/test/file_test.rb
 - lib/linecook/test/regexp_escape.rb
 - lib/linecook/test/shell_test.rb
+- lib/linecook/test/shim.rb
 - lib/linecook/utils.rb
 - lib/linecook/version.rb
 - templates/Gemfile