dnapi 1.1.78 → 1.1.79.ruby19

data/lib/dnapi.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 require 'extlib'
 require 'json'
+require 'jexp'
 
 module DNApi
   def self.build(attributes = {})
@@ -32,7 +33,6 @@ module DNApi
 end
 
 require 'dnapi/component'
-require 'dnapi/extensions'
 require 'dnapi/struct'
 require 'dnapi/component_possessor'
 require 'dnapi/recipe'

data/lib/dnapi/environment.rb

@@ -10,7 +10,7 @@ module DNApi
                                  :stack_name, :name, :framework_env,
                                  :stats_password, :ssh_username, :ssh_password,
                                  :ssh_keys, :db_stack_name,
-                                 :monitoring, :region, :backup_bucket)
+                                 :monitoring, :region, :backup_bucket, :run_list)
 
     include ComponentPossessor
 

data/lib/dnapi/struct.rb

@@ -129,7 +129,10 @@ module DNApi
     def to_hash
       data = members.zip(values)
       association_data = _many.zip(_many_values) + _ones.zip(_ones_values)
-      (data + association_data).inject({}) {|h,(k,v)| h.update(k => v) } #.reject {|k,v| v.nil? }
+      hash = (data + association_data).inject({}) do |h,(k,v)| 
+        h.update(k => v)
+      end #.reject {|k,v| v.nil? }
+      hash
     end
 
     def ==(other)

data/lib/dnapi/test.rb

@@ -1,6 +1,6 @@
 require 'dnapi'
 
-%w( randexp ey_slater ).each do |dep|
+%w( randexp  ).each do |dep|
   begin
     require dep
   rescue LoadError => e

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.78'
+  VERSION = '1.1.79.ruby19'
 end

data/spec/proxies_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/proxies'
+require File.expand_path('proxies', File.dirname(__FILE__))
 require 'pp'
 require 'sexp_processor' #defines Object#deep_copy
 

data/spec/stack_spec.rb

@@ -75,6 +75,7 @@ describe DNApi::Stack do
   end
 
   context "responds to legacy helper methods" do
+    subject { DNApi::Stack.all.first }
     it { should respond_to(:apache?)}
     it { should respond_to(:nginx?)}
     it { should respond_to(:passenger?)}

metadata

@@ -1,74 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dnapi
-version: !ruby/object:Gem::Version 
-  hash: 143
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 78
-  version: 1.1.78
+version: !ruby/object:Gem::Version
+  version: 1.1.79.ruby19
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156364040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: extlib
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156364040
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: &2156361680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2156361680
+- !ruby/object:Gem::Dependency
   name: sexp_processor
+  requirement: &2156360180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156360180
+- !ruby/object:Gem::Dependency
+  name: jexp
+  requirement: &2156358300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2156358300
 description: API for chef DNA.
-email: 
+email:
 - gems@engineyard.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/dnapi/app.rb
 - lib/dnapi/component.rb
 - lib/dnapi/component_possessor.rb
@@ -92,7 +85,6 @@ files:
 - lib/dnapi/db_stack.rb
 - lib/dnapi/ebuild_dep.rb
 - lib/dnapi/environment.rb
-- lib/dnapi/extensions.rb
 - lib/dnapi/gem_dep.rb
 - lib/dnapi/instance.rb
 - lib/dnapi/monitoring.rb
@@ -126,40 +118,29 @@ files:
 - spec/struct_spec.rb
 homepage: http://github.com/engineyard/dnapi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: API for chef DNA.
-test_files: 
+test_files:
 - spec/app_spec.rb
 - spec/component_spec.rb
 - spec/components/addons_spec.rb
@@ -178,3 +159,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
+has_rdoc: 

data/lib/dnapi/extensions.rb

@@ -1,32 +0,0 @@
-class Array
-  def to_jexp
-    map {|v| JSON.jexp(v) }
-  end
-end
-
-class Hash
-  def to_jexp
-    inject(self::class.new) do |h, (key, value)|
-      h.update key.to_s => JSON.jexp(value)
-    end
-  end
-end
-
-class Integer
-  def to_jexp() self end
-end
-
-module JSON
-  def self.jexp(*a)
-    if a.size == 1 && RUBY_VERSION >= "1.9.0"
-      o = a.first
-      o.respond_to?(:to_jexp) ? o.to_jexp : JSON.parse(JSON.dump([o])).first
-    else
-      return *a.map{|o| o.respond_to?(:to_jexp) ? o.to_jexp : JSON.parse(JSON.dump([o])).first}
-    end
-  end
-end
-
-class String
-  def to_jexp() self end
-end