engineyard-serverside 1.4.11 → 1.4.12

data/lib/engineyard-serverside.rb

@@ -1,3 +1,12 @@
+if String.instance_methods.include?(:force_encoding)
+  $string_encodings = true
+else
+  # KCODE is gone in 1.9-like implementations, but we
+  # still need to set it for 1.8.
+  $KCODE = 'U'
+  $string_encodings = false
+end
+
 $LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/open4/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))
@@ -22,22 +31,17 @@ require 'engineyard-serverside/deprecation'
 
 module EY
   module Serverside
-    
+    RemoteFailure = Class.new StandardError
+
     def self.node
       @node ||= deep_indifferentize(JSON.parse(dna_json))
     end
 
     def self.dna_json
-      @dna_json ||= if File.exist?('/etc/chef/dna.json')
-                      `sudo cat /etc/chef/dna.json`
-                    else
-                      {}.to_json
-                    end
+      @dna_json ||= read_encoded_dna
     end
 
-    RemoteFailure = Class.new StandardError
-
-    private
+    private # doesn't work how people think, but hey..
     def self.deep_indifferentize(thing)
       if thing.kind_of?(Hash)
         indifferent_hash = Thor::CoreExt::HashWithIndifferentAccess.new
@@ -51,6 +55,19 @@ module EY
         thing
       end
     end
-    
+
+    def self.dna_path
+      '/etc/chef/dna.json'
+    end
+
+    def self.read_encoded_dna
+      json = if File.exist?(dna_path)
+               `sudo cat #{dna_path}`
+             else
+               '{}'
+             end
+      json.force_encoding('UTF-8') if $string_encodings
+      json
+    end
   end
 end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.11'
+    VERSION = '1.4.12'
   end
 end

data/spec/real_deploy_spec.rb

@@ -151,7 +151,7 @@ describe "deploying an application" do
 
     # pretend there is a shared bundled_gems directory
     FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
-    %w(RUBY_VERSION SYSTEM_VERSION).each do |name| 
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
       File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
     end
 

data/spec/spec_helper.rb

@@ -7,9 +7,8 @@ require 'engineyard-serverside'
 module EY
   module Serverside
     def self.dna_json=(j)
-      @dna_json = j;
+      @dna_json = j
       @node = nil
-      j
     end
 
     module LoggedOutput

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 4
-  - 11
-  version: 1.4.11
+  - 12
+  version: 1.4.12
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-09-19 00:00:00 -07:00
+default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -31,12 +30,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  version_requirements: *id001
   name: rspec
-- !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,8 +44,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
   name: rake
+  prerelease: false
+  type: :development
+  requirement: *id002
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -265,6 +266,8 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
+- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
@@ -283,6 +286,7 @@ files:
 - spec/support/lockfiles/1.0.6-with-bundler
 - spec/support/lockfiles/evil-yaml
 - spec/support/lockfiles/not-a-lockfile
+has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
 
@@ -312,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -320,6 +324,8 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
+- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb