dnapi 1.1.85 → 1.1.86.pre

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

@@ -97,11 +97,7 @@ module DNApi
     end
 
     def db_host
-      if db_master
-        db_master.public_hostname
-      else
-        solo.public_hostname
-      end
+      host = (db_master || solo) and host.public_hostname
     end
 
     def solo?
@@ -141,7 +137,7 @@ module DNApi
     end
 
     def environment_hash
-      {:name => name, :framework_env => framework_env, :stack => stack.name}
+      {:name => name, :framework_env => framework_env, :stack => (stack and stack.name)}
     end
 
     def haproxy_hash
@@ -220,7 +216,7 @@ module DNApi
     end
 
     def to_legacy_hash
-      shared = %w( alert_email aws_secret_key aws_secret_id
+      shared = %w(alert_email aws_secret_key aws_secret_id
         backup_interval backup_window
         admin_ssh_key mailserver
         internal_ssh_public_key

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.85'
+  VERSION = '1.1.86.pre'
 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,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dnapi
 version: !ruby/object:Gem::Version 
-  hash: 185
-  prerelease: 
+  hash: 961916164
+  prerelease: 7
   segments: 
   - 1
   - 1
-  - 85
-  version: 1.1.85
+  - 86
+  - pre
+  version: 1.1.86.pre
 platform: ruby
 authors: 
 - Engine Yard
@@ -59,6 +60,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jexp
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id004
 description: API for chef DNA.
 email: 
 - gems@engineyard.com
@@ -96,7 +113,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

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