bosh-release 1.1777.0 → 1.1782.0

data/bin/bosh-release

@@ -12,6 +12,7 @@ def usage(msg=nil)
   $stderr.puts "  options:"
   $stderr.puts "    --cpi <cloud provider interface> (#{CPIS.join(', ')})"
   $stderr.puts "    --job <job to compile> (defaults to 'micro_<cpi>')"
+  $stderr.puts "    --json (write apply spec file as JSON instead of YAML)"
   $stderr.puts "  commands:"
   $stderr.puts "    apply <apply_spec> <mbus_uri>"
   $stderr.puts "    compile <manifest> <release_tgz> <blobstore_path> <mbus_uri>"
@@ -21,6 +22,7 @@ end
 options = Trollop::options do
   opt :cpi, "Cloud Provider Interface", :type => String, :required => true
   opt :job, "Job to compile", :type => String
+  opt :json, "Write apply spec as JSON"
   stop_on COMMANDS
 end
 

data/lib/bosh/release.rb

@@ -2,6 +2,7 @@ module Bosh; module Release; end; end
 
 require 'logger'
 require 'yaml'
+require 'json'
 require 'blobstore_client'
 require 'common/common'
 require 'common/properties'

data/lib/bosh/release/compiler.rb

@@ -29,6 +29,10 @@ module Bosh
         send(@options["command"].to_sym)
       end
 
+      def apply_spec_json
+        File.join(@options["base_dir"], "micro/apply_spec.json")
+      end
+
       def apply_spec
         File.join(@options["base_dir"], "micro/apply_spec.yml")
       end
@@ -90,7 +94,13 @@ module Bosh
 
         # save apply spec
         FileUtils.mkdir_p(File.dirname(apply_spec))
-        File.open(apply_spec, 'w') { |f| f.write(Psych.dump(@spec)) }
+        if @options[:json]
+          File.open(apply_spec_json, 'w') { |f| f.write(@spec.to_json) }
+        else
+          File.open(apply_spec, 'w') { |f| f.write(Psych.dump(@spec)) }
+        end
+
+
 
         @spec["packages"]
       rescue => e

data/lib/bosh/release/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Release
-    VERSION = '1.1777.0'
+    VERSION = '1.1782.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-release
 version: !ruby/object:Gem::Version
-  version: 1.1777.0
+  version: 1.1782.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: agent_client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
         version: '1.16'
 description: ! 'Bosh package compiler
 
-  0308a9'
+  5aedfc'
 email: support@cloudfoundry.com
 executables:
 - bosh-release
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3834808193789457718
+      hash: 2344654701014800795
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23