shadow_puppet 0.5.2 → 0.6.0.pre

data/Appraisals

@@ -0,0 +1,21 @@
+# 2.1 lacks deep_merge, so no more love
+#appraise "2.1" do
+#  gem "activesupport", "~> 2.1.0"
+#end
+
+appraise "2.2" do
+  gem "activesupport", "~> 2.2.0"
+end
+
+
+appraise "2.3" do
+  gem "activesupport", "~> 2.3.0"
+end
+
+appraise "3.0" do
+  gem "activesupport", "~> 3.0.0"
+end
+
+appraise "3.1" do
+  gem "activesupport", "~> 3.1.0"
+end

data/Gemfile

@@ -3,13 +3,16 @@ source :rubygems
 gem 'puppet', '2.7.3'
 gem 'highline', '>= 1.5.0'
 gem 'builder', '>= 2.1.2'
-gem 'activesupport', '>= 2.0.0'
+gem 'activesupport', '>= 2.2.0'
 gem 'i18n', '>= 0.5.0'
 
 group :development do
+  gem "rake" 
+  gem "appraisal", :git => 'git://github.com/technicalpickles/appraisal.git'
   gem "rspec", "~> 2.6.0"
   gem "rspec-core", "~> 2.6.0"
   gem "jeweler", "~> 1.6.2"
+  gem "rdoc"
   gem 'ruby-debug', :platforms => :ruby_18
   gem 'ruby-debug19', :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -1,14 +1,23 @@
+GIT
+  remote: git://github.com/technicalpickles/appraisal.git
+  revision: a755e5a086fa545f13c7465009e3fb8d4b4ff571
+  specs:
+    appraisal (0.3.8)
+      bundler
+      rake
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    builder (2.1.2)
+    builder (3.0.0)
     columnize (0.3.4)
     diff-lcs (1.1.3)
-    facter (1.6.0)
+    facter (1.6.1)
     git (1.2.5)
-    highline (1.5.2)
+    highline (1.6.2)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -18,10 +27,12 @@ GEM
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    multi_json (1.0.3)
     puppet (2.7.3)
       facter (>= 1.5.1)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -50,12 +61,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 2.0.0)
+  activesupport (>= 2.2.0)
+  appraisal!
   builder (>= 2.1.2)
   highline (>= 1.5.0)
   i18n (>= 0.5.0)
   jeweler (~> 1.6.2)
   puppet (= 2.7.3)
+  rake
+  rdoc
   rspec (~> 2.6.0)
   rspec-core (~> 2.6.0)
   ruby-debug

data/Rakefile

@@ -1,4 +1,7 @@
-require 'rake'
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :development)
+require 'appraisal'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -10,7 +13,7 @@ Jeweler::Tasks.new do |gem|
   gem.rubyforge_project = "moonshine"
   gem.authors = ["Jesse Newland", "Josh Nichols", "Eric Lindvall", "Lee Jones", "Will Farrington", "dreamcat4", "Patrick Schless", "Ches Martin", "Rob Lingle", "Scott Fleckenstein"]
 
-  gem.version = "0.5.2"
+  gem.version = "0.6.0.pre"
 
   gem.rdoc_options << '--inline-source' << '--webcvs=http://github.com/railsmachine/shadow_puppet/tree/master/'
 
@@ -19,12 +22,7 @@ end
 Jeweler::GemcutterTasks.new
 
 
-begin
-  require 'rubygems'
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
+require 'rdoc/task'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/shadow_puppet/*.rb')
   rdoc.rdoc_files.include('bin/shadow_puppet')

data/lib/shadow_puppet.rb

@@ -1,7 +1,36 @@
+require 'shadow_puppet/core_ext'
+
+# Silence puppet's dependencies warnings like:
+#   racc/parser.rb:27: warning: already initialized constant Racc_Runtime_Version
+#   racc/parser.rb:28: warning: already initialized constant Racc_Runtime_Revision
+#   racc/parser.rb:30: warning: already initialized constant Racc_Runtime_Core_Version_R
+#   racc/parser.rb:31: warning: already initialized constant Racc_Runtime_Core_Revision_R
+#   racc/parser.rb:35: warning: already initialized constant Racc_Runtime_Core_Revision_C
+#   racc/parser.rb:39: warning: already initialized constant Racc_Main_Parsing_Routine
+#   racc/parser.rb:40: warning: already initialized constant Racc_YY_Parse_Method
+#   racc/parser.rb:41: warning: already initialized constant Racc_Runtime_Core_Version
+#   racc/parser.rb:42: warning: already initialized constant Racc_Runtime_Core_Revision
+#   racc/parser.rb:43: warning: already initialized constant Racc_Runtime_Type
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:102: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:107: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:107: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:108: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:108: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:109: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:109: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/type/tidy.rb:149: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/provider/service/freebsd.rb:8: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/provider/service/freebsd.rb:9: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/provider/service/freebsd.rb:10: warning: class variable access from toplevel
+#   /usr/lib/ruby/gems/1.9.1/gems/puppet-2.7.3/lib/puppet/provider/service/bsd.rb:11: warning: class variable access from toplevel
+#   NOTE: Gem.source_index is deprecated, use Specification. It will be removed on or after 2011-11-01.
+#   Gem.source_index called from /srv/app/current/vendor/plugins/moonshine/lib/moonshine/manifest/rails/rails.rb:223.
+#   NOTE: Gem::SourceIndex#search is deprecated with no replacement. It will be removed on or after 2011-11-01.
+#   Gem::SourceIndex#search called from /srv/app/current/vendor/plugins/moonshine/lib/moonshine/manifest/rails/rails.rb:223
+$VERBOSE = nil # comment this out to debug
 require 'puppet'
 require 'erb'
 
-require 'shadow_puppet/core_ext'
 require 'shadow_puppet/manifest'
 
 class ShadowPuppet::Manifest::Setup < ShadowPuppet::Manifest

data/lib/shadow_puppet/core_ext.rb

@@ -1,34 +1,13 @@
+require 'active_support'
 require 'active_support/version'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/inflector'
-require 'active_support/core_ext/class/inheritable_attributes'
 
-# zomg epic hax
-if ActiveSupport::VERSION::MAJOR < 3
-  if ActiveSupport::VERSION::TINY > 5
-    # hack around absurd number of deprecation warnings from puppet
-    # using `metaclass`
-    require 'active_support/core_ext/kernel/reporting'
-    require 'active_support/core_ext/module/attribute_accessors'
-    require 'active_support/deprecation'
-    ActiveSupport::Deprecation.silenced = true
-  end
-  require 'active_support/core_ext/string/inflections'
-  unless String.included_modules.include?(ActiveSupport::CoreExtensions::String::Inflections)
-    String.send :include, ActiveSupport::CoreExtensions::String::Inflections
-  end
-  require 'active_support/core_ext/duplicable'
-  class Hash #:nodoc:
-    include ActiveSupport::CoreExtensions::Hash::DeepMerge
-    include ActiveSupport::CoreExtensions::Hash::IndifferentAccess
-  end
-else
-  require 'active_support/core_ext/object/duplicable'
+# ActiveSupport 3 doesn't automatically load core_ext anymore
+if ActiveSupport::VERSION::MAJOR == 3
+  require 'active_support/core_ext'
 end
 
+ActiveSupport::Deprecation.silenced = true
+
 class Hash #:nodoc:
   def deep_symbolize_keys
     self.inject({}) { |result, (key, value)|

data/shadow_puppet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shadow_puppet}
-  s.version = "0.5.2"
+  s.version = "0.6.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   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.date = %q{2011-10-09}
   s.default_executable = %q{shadow_puppet}
   s.description = %q{A Ruby Puppet DSL}
   s.email = %q{will@railsmachine.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitmodules",
     ".rspec",
+    "Appraisals",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/shadow_puppet/test.rb",
     "shadow_puppet.gemspec",
     "spec/cli_spec.rb",
+    "spec/core_ext_spec.rb",
     "spec/fixtures/cli_spec_manifest.rb",
     "spec/fixtures/manifests.rb",
     "spec/manifest_spec.rb",
@@ -55,22 +57,28 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<activesupport>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<appraisal>, [">= 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<rdoc>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
       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<activesupport>, [">= 2.2.0"])
       s.add_dependency(%q<i18n>, [">= 0.5.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<appraisal>, [">= 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<rdoc>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
@@ -78,11 +86,14 @@ Gem::Specification.new do |s|
     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<activesupport>, [">= 2.2.0"])
     s.add_dependency(%q<i18n>, [">= 0.5.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<appraisal>, [">= 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<rdoc>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
   end

data/spec/core_ext_spec.rb

@@ -0,0 +1,19 @@
+describe Object do
+  subject { Object.new }
+
+  it { should respond_to(:present?) }
+  it { should respond_to(:with_options) }
+end
+
+describe String do
+  subject { "rake db:migrate spec" }
+
+  it { should respond_to(:present?) }
+end
+
+describe Hash do
+  subject { {:foo => :bar} }
+  it { should respond_to(:reverse_merge) }
+  it { should respond_to(:deep_merge) }
+  it { should respond_to(:with_indifferent_access) }
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: shadow_puppet
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 961916020
+  prerelease: 6
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  - pre
+  version: 0.6.0.pre
 platform: ruby
 authors: 
 - Jesse Newland
@@ -24,7 +25,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 -04:00
+date: 2011-10-09 00:00:00 -04:00
 default_executable: shadow_puppet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,12 +84,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 2
+        - 2
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.2.0
   prerelease: false
   requirement: *id004
 - !ruby/object:Gem::Dependency 
@@ -109,8 +110,36 @@ dependencies:
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
+  name: rake
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: appraisal
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,11 +151,11 @@ dependencies:
         - 0
         version: 2.6.0
   prerelease: false
-  requirement: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
   name: rspec-core
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,11 +167,11 @@ dependencies:
         - 0
         version: 2.6.0
   prerelease: false
-  requirement: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,11 +183,25 @@ dependencies:
         - 2
         version: 1.6.2
   prerelease: false
-  requirement: *id008
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  type: :development
+  name: rdoc
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
   name: ruby-debug
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,11 +211,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id009
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
   name: ruby-debug19
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,7 +225,7 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id010
+  requirement: *id013
 description: A Ruby Puppet DSL
 email: will@railsmachine.com
 executables: 
@@ -195,6 +238,7 @@ extra_rdoc_files:
 files: 
 - .gitmodules
 - .rspec
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -208,6 +252,7 @@ files:
 - lib/shadow_puppet/test.rb
 - shadow_puppet.gemspec
 - spec/cli_spec.rb
+- spec/core_ext_spec.rb
 - spec/fixtures/cli_spec_manifest.rb
 - spec/fixtures/manifests.rb
 - spec/manifest_spec.rb
@@ -236,12 +281,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: moonshine