linecook 1.2.1 → 2.0.0

data/lib/linecook/test.rb

@@ -1,47 +1,38 @@
-require 'linecook/package'
-require 'linecook/test/file_test'
-require 'linecook/test/shell_test'
+require 'shell_test'
+require 'linecook/recipe'
+require 'pty'
 
 module Linecook
   module Test
     module ClassMethods
+
+      # Nil host ends up falling through to the default as configured
+      # in config/ssh
       def host
         @host ||= ENV['LINECOOK_TEST_HOST'] || name
       end
-      
+
       def use_host(host)
         @host = host
       end
-      
-      def only_hosts(*patterns)
-        patterns.collect! do |pattern|
-          pattern.kind_of?(Regexp) ? pattern : /\A#{pattern}\z/
-        end
-        
-        unless patterns.any? {|pattern| host =~ pattern }
-          skip_test "not for host (#{host})"
-        end
-      end
     end
-  
+
     module ModuleMethods
       module_function
-    
+
       def included(base)
         base.extend ClassMethods
         base.extend ModuleMethods unless base.kind_of?(Class)
         super
       end
     end
-    
+
     extend ModuleMethods
-    
-    include FileTest
     include ShellTest
-    
+
     LINECOOK_DIR = File.expand_path('../../..', __FILE__)
     LINECOOK = File.join(LINECOOK_DIR, 'bin/linecook')
-    
+
     def method_dir
       @host_method_dir ||= begin
         if test_host = ENV['LINECOOK_TEST_HOST']
@@ -51,147 +42,172 @@ module Linecook
         end
       end
     end
-    
+
     def remote_dir
       method_dir[(user_dir.length + 1)..-1]
     end
-    
+
     def ssh_config_file
       method_ssh_config_file = path('config/ssh')
       File.file?(method_ssh_config_file) ? method_ssh_config_file : 'config/ssh'
     end
-    
-    def setup_cookbook(configs=nil, project_dir=method_dir)
-      configs ||= Cookbook.config_file(project_dir)
-      @cookbook = Cookbook.setup(configs, project_dir)
+
+    def setup_cookbook(project_dir=method_dir, *additional_project_dirs)
+      @cookbook = Cookbook.new(project_dir, *additional_project_dirs)
     end
-    
+
     def cookbook
       @cookbook ||= setup_cookbook
     end
-    
+
     def setup_package(env={})
-      @package = Package.setup(env, cookbook)
+      @package = Package.new(env)
     end
-    
+
     def package
       @package ||= setup_package
     end
-    
+
     def use_helpers(*helpers)
       @helpers = helpers
     end
-    
+
     def helpers
       @helpers ||= []
     end
-    
+
     def use_host(host)
       @host = host
     end
-    
+
     def host
       @host ||= self.class.host
     end
-    
+
+    def recipe
+      @recipe ||= setup_recipe
+    end
+
+    def recipes
+      @recipes ||= []
+    end
+
+    def resources
+      recipes
+    end
+
     def runlist
-      @runlist ||= []
+      recipes.map {|recipe| recipe._package_path_ }.join(',')
     end
-    
-    def setup_recipe(target_name=package.next_target_name('recipe'), mode=0700, &block)
-      recipe = package.setup_recipe(target_name, mode)
-      helpers.each {|helper| recipe.extend helper }
-      
+
+    def setup_recipe(package_path=package.next_path('recipe'), options={:mode => 0744}, &block)
+      recipe = Recipe.new(package, cookbook)
+      recipe.helpers(*helpers)
       recipe.instance_eval(&block) if block_given?
-      runlist << target_name
-      
+      recipe.register_as(package_path, options)
+
+      recipes << recipe
       @recipe = recipe
     end
-    
-    def recipe
-      @recipe ||= setup_recipe
-    end
-    
+
     def assert_recipe(expected, recipe=setup_recipe, &block)
       recipe.instance_eval(&block) if block_given?
-      recipe.close
-      
-      assert_output_equal expected, recipe.result
+      assert_str_equal expected, recipe.to_s
       recipe
     end
-    
+
     def assert_recipe_matches(expected, recipe=setup_recipe, &block)
       recipe.instance_eval(&block) if block_given?
-      recipe.close
-      
-      assert_alike expected, recipe.result
+      assert_str_match expected, recipe.to_s
       recipe
     end
-    
-    def build_package(host=self.host)
+
+    def export_package(host=self.host)
+      resources.each {|resource| resource.register_to(package) }
       package_dir = path("packages/#{host}")
-      
-      package.build
       package.export package_dir
-      
       package_dir
     end
-    
-    def run_package(options={}, host=self.host)
-      options['remote_script'] ||= runlist.join(',')
-      
-      build_package host
-      run_project options, host
+
+    def run_package(options={}, host=self.host, &block)
+      options['S'] ||= runlist
+      run_project options, export_package(host), &block
     end
-    
+
     def build_project(options={})
       options = {
-        'project_dir' => method_dir,
-        'quiet'       => true
+        'L' => 'helpers',
+        'C' => method_dir,
+        'i' => path('packages'),
+        'o' => path('packages'),
+        :max_run_time => 3
       }.merge(options)
-      
-      linecook('build', options)
+
+      Dir.chdir method_dir do
+        linecook('build', options, *glob('recipes/*.rb'))
+      end
     end
-    
-    # pick up user dir as a gem... bundler!
-    def run_project(options={}, *package_names)
+
+    def run_project(options={}, *package_dirs, &block)
+      if package_dirs.empty?
+        package_dirs = glob('packages/*').select {|path| File.directory?(path) }
+      end
+
       options = {
-        'ssh_config_file' => ssh_config_file,
-        'project_dir'     => method_dir,
-        'remote_dir'      => remote_dir,
-        'quiet'           => true,
+        'F' => ssh_config_file,
+        'D' => remote_dir,
+        'q' => true,
+        :max_run_time => 3
       }.merge(options)
-      
-      linecook('run', options, *package_names)
-    end
-    
-    def linecook(cmd, options={}, *args)
-      stdout = prepare("log/#{cmd}.out")
-      stderr = prepare("log/#{cmd}.err")
-      
-      command = "#{linecook_cmd(cmd, options, *args)} 2> '#{stderr}' > '#{stdout}'"
-      system(command)
-      
-      [File.read(stdout), "% #{command}\n#{File.read(stderr)}"]
-    end
-    
+
+      linecook('run', options, *package_dirs, &block)
+    end
+
+    def run_project_cmd(options={}, *package_dirs, &block)
+      if package_dirs.empty?
+        package_dirs = glob('packages/*').select {|path| File.directory?(path) }
+      end
+
+      options = {
+        'F' => ssh_config_file,
+        'D' => remote_dir,
+        'q' => true,
+        :max_run_time => 3
+      }.merge(options)
+
+      linecook_cmd('run', options, *package_dirs, &block)
+    end
+
+    def linecook(cmd, options={}, *args, &block)
+      command = linecook_cmd(cmd, options, *args)
+      session = Session.new(options)
+      session.on :PS1, "#{command}\n"
+      session.on :PS1, "exit\n"
+      session.run
+
+      log = session.log
+      [log[2].chomp(session.ps1), log.join]
+    end
+
     def linecook_cmd(cmd, options={}, *args)
       opts = []
       options.each_pair do |key, value|
-        key = key.to_s.gsub('_', '-')
+        next unless key.kind_of?(String)
+
+        key = key.gsub('_', '-')
         key = key.length == 1 ? "-#{key}" : "--#{key}"
-        
+
         case value
         when true
           opts << key
         when nil, false
-        else 
+        else
           opts << "#{key} '#{value}'"
         end
       end
-      
+
       args = args.collect! {|arg| "'#{arg}'" }
-      
+
       cmd = [LINECOOK, cmd] + opts.sort + args
       cmd.join(' ')
     end

data/lib/linecook/utils.rb

@@ -1,54 +1,24 @@
-require 'yaml'
-
 module Linecook
   module Utils
     module_function
-    
-    def load_config(path)
-      (path && File.exists?(path) ? YAML.load_file(path) : nil) || {}
-    end
-    
-    def arrayify(obj)
-      case obj
-      when nil    then []
-      when String then obj.split(':')
-      else obj
-      end
-    end
-    
-    def hashify(obj)
-      case obj
-      when Hash then obj
-      when nil  then {}
-      when Array
-        hash = {}
-        obj.each {|entry| hash[entry] = entry }
-        hash
-      
-      when String 
-        hashify obj.split(':')
-      
-      else nil
-      end
-    end
-    
+
     def deep_merge(a, b)
       b.each_pair do |key, current|
         previous = a[key]
         a[key] = deep_merge?(previous, current) ? deep_merge(previous, current) : current
       end
-      
+
       a
     end
-    
+
     def deep_merge?(previous, current)
       current.kind_of?(Hash) && previous.kind_of?(Hash)
     end
-    
+
     def camelize(str)
       str.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
     end
-    
+
     def underscore(str)
       str.gsub(/::/, '/').
       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -56,15 +26,35 @@ module Linecook
       tr("-", "_").
       downcase
     end
-    
-    def constantize(const_name)
-      constants = camelize(const_name).split(/::/)
-      
+
+    # Looks up the specified constant. A block may be given to look up missing
+    # constants; the last existing const and any non-existant constant names
+    # are yielded to the block, which is expected to return the desired
+    # constant.  For instance:
+    #
+    #   module ConstName; end
+    #   Constant.constantize('ConstName')                     # => ConstName
+    #   Constant.constantize('Non::Existant') { ConstName }   # => ConstName
+    #
+    # Raises a NameError for invalid/missing constants.
+    def constantize(const_name) # :yields: const, missing_const_names
+      unless  /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ const_name
+        raise NameError, "#{const_name.inspect} is not a valid constant name!"
+      end
+
       const = Object
+      constants = $1.split(/::/)
+
       while name = constants.shift
-        const = const.const_get(name)
+        begin
+          const = const.const_get(name)
+        rescue NameError
+          raise $! unless block_given?
+          constants.unshift(name)
+          return yield(const, constants)
+        end
       end
-      
+
       const
     end
   end

data/lib/linecook/version.rb

@@ -1,8 +1,4 @@
 module Linecook
-  MAJOR = 1
-  MINOR = 2
-  TINY  = 1
-  
-  VERSION = "#{MAJOR}.#{MINOR}.#{TINY}"
+  VERSION = "2.0.0"
   WEBSITE = "http://github.com/pinnacol/linecook"
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linecook
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -15,45 +15,90 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -06:00
+date: 2012-01-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 1
         segments: 
         - 0
-        - 9
-        - 0
-        version: 0.9.0
+        - 5
+        - 5
+        version: 0.5.5
   type: :runtime
+  name: config_parser
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: configurable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 7
-        - 0
-        version: 0.7.0
+        version: "1.0"
   type: :runtime
+  name: configurable
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  name: tilt
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  name: shell_test
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  name: rake
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,77 +108,82 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id003
+  type: :development
+  name: bundler
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  name: rcov
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 9
+        version: "3.9"
+  type: :development
+  name: rdoc
+  version_requirements: *id008
 description: Linecook generates shell scripts using an extensible set of ERB helpers. The shell scripts and associated resources (files, subscripts, etc) make up packages that can be used, for example, to provision servers.
-email: simon.a.chiang@gmail.com
+email: 
+- simon.a.chiang@gmail.com
 executables: 
 - linecook
 extensions: []
 
 extra_rdoc_files: 
-- History
-- README
+- History.rdoc
+- README.rdoc
 - License.txt
-- HowTo/Control Virtual Machines
-- HowTo/Generate Scripts
-- HowTo/Run Scripts
-- HowTo/Setup Virtual Machines
+- doc/vm_setup.rdoc
 files: 
 - bin/linecook_run
 - bin/linecook_scp
 - lib/linecook.rb
 - lib/linecook/attributes.rb
-- lib/linecook/commands.rb
+- lib/linecook/command.rb
+- lib/linecook/command_set.rb
+- lib/linecook/command_utils.rb
 - lib/linecook/commands/build.rb
-- lib/linecook/commands/command.rb
-- lib/linecook/commands/command_error.rb
-- lib/linecook/commands/env.rb
-- lib/linecook/commands/helper.rb
-- lib/linecook/commands/init.rb
-- lib/linecook/commands/package.rb
+- lib/linecook/commands/compile.rb
+- lib/linecook/commands/compile_helper.rb
 - lib/linecook/commands/run.rb
 - lib/linecook/commands/snapshot.rb
 - lib/linecook/commands/ssh.rb
 - lib/linecook/commands/start.rb
 - lib/linecook/commands/state.rb
 - lib/linecook/commands/stop.rb
-- lib/linecook/commands/vbox_command.rb
+- lib/linecook/commands/virtual_box_command.rb
 - lib/linecook/cookbook.rb
+- lib/linecook/executable.rb
 - lib/linecook/package.rb
 - lib/linecook/proxy.rb
 - lib/linecook/recipe.rb
-- lib/linecook/template.rb
 - lib/linecook/test.rb
-- lib/linecook/test/command_parser.rb
-- 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
-- templates/Rakefile
-- templates/_gitignore
-- templates/attributes/project_name.rb
-- templates/config/ssh
-- templates/cookbook
-- templates/files/example.txt
-- templates/helpers/project_name/echo.erb
-- templates/packages/abox.yml
-- templates/project_name.gemspec
-- templates/recipes/abox.rb
-- templates/templates/example.erb
-- templates/test/project_name_test.rb
-- templates/test/test_helper.rb
-- bin/linecook
-- History
-- README
+- History.rdoc
+- README.rdoc
 - License.txt
-- HowTo/Control Virtual Machines
-- HowTo/Generate Scripts
-- HowTo/Run Scripts
-- HowTo/Setup Virtual Machines
+- doc/vm_setup.rdoc
+- bin/linecook
 has_rdoc: true
 homepage: http://github.com/pinnacol/linecook
 licenses: []
@@ -141,7 +191,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 - -S
 - -N
 - --title
@@ -151,12 +201,14 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 55
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 9
+      - 2
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -168,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: linecook
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A shell script generator.