shadow_puppet 0.4.1 → 0.5.2

data/.rspec

@@ -0,0 +1 @@
+--debugger --require ./spec/spec_helper.rb --backtrace --color --format d

data/Gemfile

@@ -0,0 +1,15 @@
+source :rubygems
+
+gem 'puppet', '2.7.3'
+gem 'highline', '>= 1.5.0'
+gem 'builder', '>= 2.1.2'
+gem 'activesupport', '>= 2.0.0'
+gem 'i18n', '>= 0.5.0'
+
+group :development do
+  gem "rspec", "~> 2.6.0"
+  gem "rspec-core", "~> 2.6.0"
+  gem "jeweler", "~> 1.6.2"
+  gem 'ruby-debug', :platforms => :ruby_18
+  gem 'ruby-debug19', :platforms => :ruby_19
+end

data/Gemfile.lock

@@ -0,0 +1,62 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.10)
+    archive-tar-minitar (0.5.2)
+    builder (2.1.2)
+    columnize (0.3.4)
+    diff-lcs (1.1.3)
+    facter (1.6.0)
+    git (1.2.5)
+    highline (1.5.2)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    puppet (2.7.3)
+      facter (>= 1.5.1)
+    rake (0.9.2)
+    rbx-require-relative (0.0.5)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.0.0)
+  builder (>= 2.1.2)
+  highline (>= 1.5.0)
+  i18n (>= 0.5.0)
+  jeweler (~> 1.6.2)
+  puppet (= 2.7.3)
+  rspec (~> 2.6.0)
+  rspec-core (~> 2.6.0)
+  ruby-debug
+  ruby-debug19

data/README.rdoc

@@ -12,7 +12,6 @@ ShadowPuppet::Manifest.
 
 == Running the Test Suite
 
-    $ gem install rspec isolate-scenarios
-    $ rake spec
-    # To test against all supported versions of ActiveSupport:
-    $ isolate-scenarios rake spec
+    $ gem install bundler
+    $ bundle install
+    $ bundle exec rake spec

data/Rakefile

@@ -5,24 +5,15 @@ Jeweler::Tasks.new do |gem|
   gem.name = "shadow_puppet"
   gem.summary = %Q{A Ruby Puppet DSL}
   gem.description = %Q{A Ruby Puppet DSL}
-  gem.email = "jesse@railsmachine.com"
+  gem.email = "will@railsmachine.com"
   gem.homepage = "http://railsmachine.github.com/shadow_puppet"
   gem.rubyforge_project = "moonshine"
-  gem.authors = ["Jesse Newland", "Josh Nichols", "Eric Lindvall", "Lee Jones", "dreamcat4", "Patrick Schless", "Ches Martin", "Rob Lingle", "Scott Fleckenstein", "Will Farrington"]
+  gem.authors = ["Jesse Newland", "Josh Nichols", "Eric Lindvall", "Lee Jones", "Will Farrington", "dreamcat4", "Patrick Schless", "Ches Martin", "Rob Lingle", "Scott Fleckenstein"]
 
-  gem.version = "0.4.1"
-
-  gem.add_dependency('puppet', ["= 0.24.8"])
-  gem.add_dependency('facter', [">= 1.5.4"])
-  gem.add_dependency('highline', [">= 1.5.0"])
-  gem.add_dependency('builder', [">= 2.1.2"])
-  gem.add_dependency('activesupport', [">= 2.0.0"])
+  gem.version = "0.5.2"
 
   gem.rdoc_options << '--inline-source' << '--webcvs=http://github.com/railsmachine/shadow_puppet/tree/master/'
 
-  gem.add_development_dependency "rspec", ">= 0"
-  gem.add_development_dependency "isolate-scenarios", ">= 0"
-
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end
 Jeweler::GemcutterTasks.new
@@ -46,9 +37,15 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--webcvs=http://github.com/railsmachine/shadow_puppet/tree/master/'
 end
 
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
 task :default => :spec
-task :spec do
-  system("spec --options spec/spec.opts spec/*_spec.rb") || raise
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
 end
 
 task :build => :cleanup do

data/bin/shadow_puppet

@@ -102,18 +102,19 @@ begin
 
   opts.parse!
 
+  # Take any variables set on the command line and update ENV
+  ARGV.delete_if do |arg|
+    next unless arg =~ /^(\w+)=(.*)$/
+    ENV[$1] = $2
+  end
+
   unless filename = ARGV[0]
     puts "Error: Manifest filename must be provided\n\n"
     puts opts
     exit(1)
-    # Take any variables set on the command line and update ENV
-    ARGV.delete_if do |arg|
-      next unless arg =~ /^(\w+)=(.*)$/
-      ENV[$1] = $2
-    end
   end
 
-  require 'rubygems'
+  $LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
   require 'shadow_puppet/core_ext'
   require 'shadow_puppet'
   require 'fileutils'
@@ -123,6 +124,8 @@ begin
     Puppet[:show_diff] = true
   end
 
+  Puppet::Util::Log.newdestination(:console)
+
   klass = File.basename(filename, ".rb")
   require filename
   manifest = klass.camelize.constantize.new

data/lib/shadow_puppet/manifest.rb

@@ -75,7 +75,7 @@ module ShadowPuppet
 
     class_inheritable_accessor :recipes
     write_inheritable_attribute(:recipes, [])
-    attr_reader :puppet_resources
+    attr_reader :catalog
     class_inheritable_accessor :__config__
     write_inheritable_attribute(:__config__, Hash.new)
 
@@ -97,9 +97,9 @@ module ShadowPuppet
 
       configure(config)
       @executed = false
-      @puppet_resources = Hash.new do |hash, key|
-        hash[key] = {}
-      end
+      @catalog = Puppet::Resource::Catalog.new
+      @catalog.host_config = false
+      @catalog.name = self.name
     end
 
     # Declares that the named method or methods will be called whenever
@@ -208,11 +208,7 @@ module ShadowPuppet
         # remove the method rdoc placeholders
         remove_method(type.name) rescue nil
         define_method(type.name) do |*args|
-          if args && args.flatten.size == 1
-            reference(type.name, args.first)
-          else
-            new_resource(type, args.first, args.last)
-          end
+          resource_or_reference(type, *args)
         end
       end
     end
@@ -269,9 +265,7 @@ module ShadowPuppet
     def graph_to(name, destination)
       evaluate_recipes
 
-      bucket             = export()
-      catalog            = bucket.to_catalog
-      relationship_graph = catalog.relationship_graph
+      relationship_graph = @catalog.relationship_graph
 
       graph = relationship_graph.to_dot_graph("name" => "#{name} Relationships".gsub(/\W+/, '_'))
       graph.options['label'] = "#{name} Relationships"
@@ -294,29 +288,6 @@ module ShadowPuppet
       @executed
     end
 
-    #An Array of all currently defined resources.
-    def flat_resources
-      a = []
-      @puppet_resources.each_value do |by_type|
-        by_type.each_value do |by_name|
-          a << by_name
-        end
-      end
-      a
-    end
-
-    #A Puppet::TransBucket of all defined resoureces.
-    def export
-      transportable_objects = flat_resources.dup.reject { |a| a.nil? }.flatten.collect do |obj|
-        obj.to_trans
-      end
-      b = Puppet::TransBucket.new(transportable_objects)
-      b.name = name
-      b.type = "class"
-
-      return b
-    end
-
     private
 
     #Evaluate the methods calls queued in self.recipes
@@ -333,68 +304,46 @@ module ShadowPuppet
 
     # Create a catalog of all contained Puppet Resources and apply that
     # catalog to the currently running system
-    def apply(bucket = nil)
-      bucket ||= export()
-      catalog = bucket.to_catalog
+    def apply
       catalog.apply
       catalog.clear
     end
 
-    def scope #:nodoc:
-      unless defined?(@scope)
-        # Set the code to something innocuous; we just need the
-        # scopes, not the interpreter.  Hackish, but true.
-        Puppet[:code] = " "
-        @interp = Puppet::Parser::Interpreter.new
-        require 'puppet/node'
-        @node = Puppet::Node.new(Facter.value(:hostname))
-        if env = Puppet[:environment] and env == ""
-          env = nil
+    def resource_or_reference(type, *args)
+      if args
+        if args.flatten.size == 1
+          reference(type, args.first)
+        elsif resource = existing_resource(type.name, args.first)
+          new_resource(type, args.first, args.last).parameters.each do |name, param|
+            resource[name] = param.value if param.value
+          end
+          resource
+        else
+          add_resource(type, args.first, args.last)
         end
-        @node.parameters = Facter.to_hash
-        @compile = Puppet::Parser::Compiler.new(@node, @interp.send(:parser, env))
-        @scope = @compile.topscope
       end
-      @scope
     end
 
-    # Create a reference to another Puppet Resource.
-    def reference(type, title)
-      Puppet::Parser::Resource::Reference.new(:type => type.to_s, :title => title.to_s, :scope => scope)
+    def existing_resource(type, title)
+      catalog.resources.detect { |r| r.type == type && r.title == title }
     end
 
-    # Creates a new Puppet Resource.
-    def new_resource(type, name, params = {})
-      unless obj = @puppet_resources[type][name]
-        obj = Puppet::Parser::Resource.new(
-          :title => name,
-          :type => type.name,
-          :source => self,
-          :scope => scope
-        )
-        @puppet_resources[type][name] = obj
-      end
-
-      case type.name
-      when :exec
-        param = Puppet::Parser::Resource::Param.new(
-          :name => :path,
-          :value => ENV["PATH"],
-          :source => self
-        )
-        obj.send(:set_parameter, param)
-      end
+    # Create a reference to another Puppet Resource.
+    def reference(type, title, params = {})
+      Puppet::Parser::Resource::Reference.new(type.name.to_s.capitalize, title.to_s)
+    end
 
-      params.each do |param_name, param_value|
-        param = Puppet::Parser::Resource::Param.new(
-          :name => param_name,
-          :value => param_value,
-          :source => self
-        )
-        obj.send(:set_parameter, param)
-      end
+    # Creates a new Puppet Resource and adds it to the Catalog.
+    def add_resource(type, title, params = {})
+      catalog.add_resource(new_resource(type, title, params))
+    end
 
-      obj
+    def new_resource(type, title, params = {})
+      params.merge!({:title   => title.to_s})
+      params.merge!({:catalog => catalog})
+      params.merge!({:path    => ENV["PATH"]}) if type.name == :exec && params[:path].nil?
+      params.merge!({:cwd     => params[:cwd].to_s}) if params[:cwd]
+      Puppet::Type.type(type.name).new(params)
     end
 
   end

data/lib/shadow_puppet/test.rb

@@ -1,18 +1,15 @@
 module Puppet
-  module Parser
-    class Resource
+  class Type
 
-      # clearing out some puppet methods that we probably won't need for testing
-      # that are also used in the params hash when defining the resource.
-      undef path
-      undef source
-      undef require
+    # clearing out some puppet methods that we probably won't need for testing
+    # that are also used in the params hash when defining the resource.
+    undef path
+    undef require
       
-      # This allows access to resource options as methods on the resource.
-      def method_missing name, *args
-        if params.keys.include? name.to_sym
-          params[name.to_sym].value
-        end
+    # This allows access to resource options as methods on the resource.
+    def method_missing name, *args
+      if parameters.keys.include? name.to_sym
+        parameters[name.to_sym].value
       end
     end
   end
@@ -59,7 +56,9 @@ module ShadowPuppet
         #undefine the method rdoc placeholders
         undef_method(plural_type) rescue nil
         define_method(plural_type) do |*args|
-          puppet_resources[type]
+          catalog.resources.select { |r| r.type == type.name }.inject({}) do |hash, resource|
+            hash[resource.title] = resource; hash
+          end
         end
       end
     end

data/shadow_puppet.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shadow_puppet}
-  s.version = "0.4.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jesse Newland", "Josh Nichols", "Eric Lindvall", "Lee Jones", "dreamcat4", "Patrick Schless", "Ches Martin", "Rob Lingle", "Scott Fleckenstein", "Will Farrington"]
-  s.date = %q{2011-08-12}
+  s.authors = ["Jesse Newland", "Josh Nichols", "Eric Lindvall", "Lee Jones", "Will Farrington", "dreamcat4", "Patrick Schless", "Ches Martin", "Rob Lingle", "Scott Fleckenstein"]
+  s.date = %q{2011-09-20}
   s.default_executable = %q{shadow_puppet}
   s.description = %q{A Ruby Puppet DSL}
-  s.email = %q{jesse@railsmachine.com}
+  s.email = %q{will@railsmachine.com}
   s.executables = ["shadow_puppet"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitmodules",
-    "IsolateScenarios",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -31,9 +33,10 @@ Gem::Specification.new do |s|
     "lib/shadow_puppet/manifest.rb",
     "lib/shadow_puppet/test.rb",
     "shadow_puppet.gemspec",
+    "spec/cli_spec.rb",
+    "spec/fixtures/cli_spec_manifest.rb",
     "spec/fixtures/manifests.rb",
     "spec/manifest_spec.rb",
-    "spec/spec.opts",
     "spec/spec_helper.rb",
     "spec/test_spec.rb",
     "spec/type_spec.rb"
@@ -42,37 +45,46 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--inline-source", "--webcvs=http://github.com/railsmachine/shadow_puppet/tree/master/"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{moonshine}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A Ruby Puppet DSL}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<puppet>, ["= 0.24.8"])
-      s.add_runtime_dependency(%q<facter>, [">= 1.5.4"])
+      s.add_runtime_dependency(%q<puppet>, ["= 2.7.3"])
       s.add_runtime_dependency(%q<highline>, [">= 1.5.0"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<isolate-scenarios>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec-core>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
-      s.add_dependency(%q<puppet>, ["= 0.24.8"])
-      s.add_dependency(%q<facter>, [">= 1.5.4"])
+      s.add_dependency(%q<puppet>, ["= 2.7.3"])
       s.add_dependency(%q<highline>, [">= 1.5.0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<isolate-scenarios>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec-core>, ["~> 2.6.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
   else
-    s.add_dependency(%q<puppet>, ["= 0.24.8"])
-    s.add_dependency(%q<facter>, [">= 1.5.4"])
+    s.add_dependency(%q<puppet>, ["= 2.7.3"])
     s.add_dependency(%q<highline>, [">= 1.5.0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<isolate-scenarios>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0.5.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec-core>, ["~> 2.6.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
   end
 end
 

data/spec/cli_spec.rb

@@ -0,0 +1,16 @@
+describe "ShadowPuppet's cli" do
+  before(:all) do
+    @root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    @output = `#{@root}/bin/shadow_puppet #{@root}/spec/fixtures/cli_spec_manifest.rb echo=works`
+  end
+
+  it "accepts env variables on the end of the command line" do
+    @output.should =~ /Exec\[from_env\]\/returns: works/
+  end
+
+  it "outputs the name of the manifest it's executing" do
+    pending "can't yet determine how to do this"
+    @output.should =~ /CliSpecManifest/
+  end
+
+end

data/spec/fixtures/cli_spec_manifest.rb

@@ -0,0 +1,7 @@
+class CliSpecManifest < ShadowPuppet::Manifest
+  def test_setting_env
+    exec :from_env, :command => "echo #{ENV['echo']}", :logoutput => true
+    exec :normal, :command => "echo test", :logoutput => true
+  end
+  recipe :test_setting_env
+end

data/spec/fixtures/manifests.rb

@@ -135,7 +135,54 @@ class TestHelpers < ShadowPuppet::Manifest
   def foo
     exec('foo', :command => 'true',:onlyif => 'test `hostname` == "foo"')
     package('bar',:ensure => :installed)
-    file('baz', :content => 'bar',:mode => '644',:owner => 'rails')
+    file('/tmp/baz', :content => 'bar',:mode => '644',:owner => 'rails', :before => package('bar'))
   end
 
 end
+
+class DependencyTestManifest < ShadowPuppet::Manifest
+  def test
+    exec('foobar', :command => 'true', :before => exec('barbaz'))
+    exec('trololol', :command => 'true', :alias => "winning")
+    exec('barbaz', :command => 'true', :require => [exec('foobar'), exec('winning')])
+
+  end
+  recipe :test
+end
+
+class StupidTestManifest < ShadowPuppet::Manifest
+  def my_recipe
+    exec 'my_command',
+      :command => 'true',
+      :require => [ file('/tmp/foo'), exec('jk') ]
+    file '/tmp/foo',
+      :content => 'true'
+    exec 'jk',
+      :command => 'true'
+  end
+  recipe :my_recipe
+end
+
+class CwdCoercionTest < ShadowPuppet::Manifest
+  def test
+    tmp = Pathname.new('/tmp')
+    exec 'true',
+      :cwd => tmp
+    file tmp + '/foo',
+      :ensure => :present
+  end
+  recipe :test
+end
+
+class DuplicateResourceTest < ShadowPuppet::Manifest
+  def first_resource
+    exec 'true',
+      :cwd => Pathname.new('/tmp')
+  end
+
+  def second_resource
+    exec 'true',
+      :cwd => Pathname.new('/tmp'),
+      :logoutput => true
+  end
+end

data/spec/manifest_spec.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
 describe "A manifest" do
 
   describe "when blank" do
@@ -39,7 +37,7 @@ describe "A manifest" do
       end
 
       it "applies our customizations to resources" do
-        @manifest.execs["foo"].path.should == ENV["PATH"]
+        @manifest.execs["foo"].path.should == ENV["PATH"].split(':')
       end
 
       describe "and then executing" do
@@ -124,18 +122,14 @@ describe "A manifest" do
       end
 
       it "creates new resources" do
-        @manifest.should_receive(:new_resource).with(Puppet::Type::Exec, 'foo', :command => 'true').exactly(1).times
-        @manifest.should_receive(:new_resource).with(Puppet::Type::Exec, 'bar', :command => 'true').exactly(1).times
+        @manifest.should_receive(:add_resource).with(Puppet::Type::Exec, 'foo', :command => 'true').exactly(1).times
+        @manifest.should_receive(:add_resource).with(Puppet::Type::Exec, 'bar', :command => 'true').exactly(1).times
         @manifest.send(:evaluate_recipes)
       end
 
       it "creates new resources" do
         @manifest.send(:evaluate_recipes)
-        @manifest.puppet_resources[Puppet::Type::Exec].keys.sort.should == ['bar', 'foo']
-      end
-
-      it "can acess a flat array of resources" do
-        @manifest.send(:flat_resources).should == []
+        @manifest.execs.keys.sort.should == ['bar', 'foo']
       end
 
     end
@@ -221,22 +215,86 @@ describe "A manifest" do
 
   describe "when moonshine setup" do
 
+     before(:each) do
+       @manifest = MoonshineSetupManifest.new
+     end
+
+     it "include directories recipe" do
+       @manifest.class.recipes.map(&:first).should include(:directories)
+     end
+
+     it "calls specified methods" do
+       @manifest.should_receive(:directories)
+       @manifest.send(:evaluate_recipes)
+     end
+
+     it "returns true when executed" do
+       @manifest.execute.should be_true
+     end
+
+   end
+
+  describe "when dependency test manifest" do
     before(:each) do
-      @manifest = MoonshineSetupManifest.new
+      @manifest = DependencyTestManifest.new
     end
 
     it "include directories recipe" do
-      @manifest.class.recipes.map(&:first).should include(:directories)
+      @manifest.class.recipes.map(&:first).should include(:test)
     end
 
     it "calls specified methods" do
-      @manifest.should_receive(:directories)
+      @manifest.should_receive(:test)
       @manifest.send(:evaluate_recipes)
     end
 
     it "returns true when executed" do
-      @manifest.execute.should be_true
+      @manifest.execute!.should be_true
+    end
+  end
+
+  describe "when referencing files" do
+    before(:each) do
+      @manifest = StupidTestManifest.new
+    end
+
+    it "returns true when executed " do
+      @manifest.execute!.should be_true
     end
+  end
 
+  describe "when passing a pathname to cwd" do
+    before(:each) do
+      @manifest = CwdCoercionTest.new
+    end
+
+    it "returns true when executed" do
+      @manifest.execute!.should be_true
+    end
+  end
+
+  describe "with multiple calls to the same resource" do
+    before(:each) do
+      @manifest = DuplicateResourceTest.new
+    end
+
+    it "creates the resource the first time" do
+      @manifest.first_resource
+      @manifest.execs["true"].cwd.should == '/tmp'
+      @manifest.execs["true"].logoutput.should be_nil
+    end
+
+    it "updates the resource subsequent times" do
+      @manifest.first_resource
+      @manifest.second_resource
+      @manifest.execs["true"].cwd.should == '/tmp'
+      @manifest.execs["true"].logoutput.should be_true
+    end
+
+    it "can execute successfully" do
+      @manifest.first_resource
+      @manifest.second_resource
+      @manifest.execute!
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
-require 'rubygems'
-require 'isolate/scenarios/now'
-gem 'rspec'
-require 'spec'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shadow_puppet', 'core_ext.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shadow_puppet.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shadow_puppet', 'test.rb')
-Dir.glob(File.join(File.dirname(__FILE__), 'fixtures', '*.rb')).each do |manifest|
+require 'bundler'
+Bundler.require
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
+
+require 'shadow_puppet/core_ext'
+require 'shadow_puppet'
+require 'shadow_puppet/test'
+
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'fixtures', '*.rb')).each do |manifest|
   require manifest
 end

data/spec/test_spec.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
 describe "ShadowPuppet's test helpers" do
 
   it "should be created when register_puppet_types_for_testing is called" do
@@ -19,24 +17,19 @@ describe "ShadowPuppet's test helpers" do
     end
   
     it "should allow simple resource lookup" do
-      @manifest.execs.should == @manifest.puppet_resources[Puppet::Type::Exec]
-      @manifest.packages.should == @manifest.puppet_resources[Puppet::Type::Package]
-      @manifest.files.should == @manifest.puppet_resources[Puppet::Type::File]
+      @manifest.execs.keys.should == ['foo']
+      @manifest.packages.keys.should == ['bar']
+      @manifest.files.keys.should == ['/tmp/baz']
+      @manifest.crons.keys.should == []
     end
 
     # making sure that properties such as, e.g the :onlyif condition of Exec[foo] 
     # can be accessed simply as manifest.execs['foo'].onlyif rather than via the 
     # param hash
     it "should allow referencing params directly" do
-      %w(execs files packages).each do |type|
-        @manifest.send(type.to_sym).each do |name,resource|
-          resource.params.keys.each do |param|
-            resource.send(param.to_sym).should == resource.params[param.to_sym].value
-          end
-        end
-      end
+      @manifest.execs['foo'].command.should == 'true'
     end
 
   end
 
-end
+end

data/spec/type_spec.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
 describe "ShadowPuppet's type loading mechanism" do
   it "should create a new type helper methods when register_puppet_types is called" do
     Puppet::Type.newtype(:dummy_1){ }
@@ -9,4 +7,4 @@ describe "ShadowPuppet's type loading mechanism" do
     ShadowPuppet::Manifest.register_puppet_types
     BlankManifest.new.respond_to?(:dummy_1).should == true
   end
-end
+end

metadata

@@ -1,68 +1,52 @@
 --- !ruby/object:Gem::Specification 
 name: shadow_puppet
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jesse Newland
 - Josh Nichols
 - Eric Lindvall
 - Lee Jones
+- Will Farrington
 - dreamcat4
 - Patrick Schless
 - Ches Martin
 - Rob Lingle
 - Scott Fleckenstein
-- Will Farrington
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -04:00
+date: 2011-09-20 00:00:00 -04:00
 default_executable: shadow_puppet
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: puppet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 111
+        hash: 21
         segments: 
-        - 0
-        - 24
-        - 8
-        version: 0.24.8
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: facter
+        - 2
+        - 7
+        - 3
+        version: 2.7.3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: highline
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +57,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: builder
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,12 +73,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: activesupport
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +89,76 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id005
+  name: i18n
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  prerelease: false
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec-core
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
+        version: 1.6.2
+  prerelease: false
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: ruby-debug
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +167,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: isolate-scenarios
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: ruby-debug19
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,10 +181,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id007
+  prerelease: false
+  requirement: *id010
 description: A Ruby Puppet DSL
-email: jesse@railsmachine.com
+email: will@railsmachine.com
 executables: 
 - shadow_puppet
 extensions: []
@@ -146,7 +194,9 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitmodules
-- IsolateScenarios
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -157,9 +207,10 @@ files:
 - lib/shadow_puppet/manifest.rb
 - lib/shadow_puppet/test.rb
 - shadow_puppet.gemspec
+- spec/cli_spec.rb
+- spec/fixtures/cli_spec_manifest.rb
 - spec/fixtures/manifests.rb
 - spec/manifest_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/test_spec.rb
 - spec/type_spec.rb
@@ -194,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: moonshine
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Ruby Puppet DSL

data/IsolateScenarios

@@ -1,11 +0,0 @@
-baseline do
-  gem 'rspec', '~> 1.3.0'
-end
-
-gem_version_scenario 'activesupport',
-  '3.0.0',
-  '3.0.0.rc',
-  '3.0.0.beta4',
-  '2.2.3',
-  '2.3.5',
-  '2.3.8'

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format s
---loadby mtime
---reverse