bosh_cli 0.19.5 → 0.19.6

data/lib/cli.rb

@@ -37,6 +37,8 @@ unless defined?(Bosh::Cli::VERSION)
   require "cli/version"
 end
 
+require "common/common"
+
 require "cli/config"
 require "cli/core_ext"
 require "cli/errors"

data/lib/cli/commands/base.rb

@@ -87,8 +87,9 @@ module Bosh::Cli
 
       # @return [String] Target director URL
       def target
-        url = options[:target] || config.target
-        config.resolve_alias(:target, url) || url
+        raw_url = options[:target] || config.target
+        url = config.resolve_alias(:target, raw_url) || raw_url
+        url ? normalize_url(url) : nil
       end
       alias_method :target_url, :target
 

data/lib/cli/commands/deployment.rb

@@ -67,6 +67,15 @@ module Bosh::Cli::Command
       config.save
     end
 
+    def edit
+      unless deployment
+        quit("Deployment not set".red)
+      end
+
+      editor = ENV['EDITOR'] || "vi"
+      system("#{editor} #{deployment}")
+    end
+
     def perform(*options)
       auth_required
       recreate = options.include?("--recreate")

data/lib/cli/commands/release.rb

@@ -112,6 +112,8 @@ module Bosh::Cli::Command
       remote_release = get_remote_release(manifest["name"]) rescue nil
       package_matches = match_remote_packages(File.read(manifest_path))
 
+      find_release_dir(manifest_path)
+
       blobstore = release.blobstore
       tmpdir = Dir.mktmpdir
 
@@ -429,6 +431,19 @@ module Bosh::Cli::Command
 
     private
 
+    # if we aren't already in a release directory, try going up two levels
+    # to see if that is a release directory, and then use that as the base
+    def find_release_dir(manifest_path)
+      unless in_release_dir?
+        dir = File.expand_path("../..", manifest_path)
+        Dir.chdir(dir)
+        if in_release_dir?
+          @release = Bosh::Cli::Release.new(dir)
+        end
+      end
+
+    end
+
     def show_summary(builder)
       packages_table = table do |t|
         t.headings = %w(Name Version Notes Fingerprint)

data/lib/cli/core_ext.rb

@@ -108,7 +108,8 @@ module BoshStringExtensions
   end
 
   def colorize(color_code)
-    if Bosh::Cli::Config.output.tty? &&
+    if Bosh::Cli::Config.output &&
+       Bosh::Cli::Config.output.tty? &&
        Bosh::Cli::Config.colorize &&
        COLOR_CODES[color_code]
 

data/lib/cli/release.rb

@@ -52,13 +52,37 @@ module Bosh::Cli
       end
     end
 
-    # Check if the blobstore secret is provided in the private config file
-    #
+    # Check if the deprecated blobstore secret is provided in the private
+    # config file
     # @return [Boolean]
-    def has_blobstore_secret?
+    def has_legacy_secret?
       @private_config.has_key?("blobstore_secret")
     end
 
+    def has_blobstore_secret?
+      bs = @private_config["blobstore"]
+      has_legacy_secret? ||
+        has_blobstore_secrets?(bs, "atmos", "secret") ||
+        has_blobstore_secrets?(bs, "simple", "user", "password") ||
+        has_blobstore_secrets?(bs, "s3", "access_key_id", "secret_access_key")
+    end
+
+    # final.yml
+    # ---
+    # blobstore:
+    #   provider: ...
+    #   options:
+    #     ...: ...
+
+    # private.yml
+    # ---
+    # blobstore:
+    #   s3:
+    #     secret_access_key: ...
+    #     access_key_id: ...
+    #   atmos:
+    #     secret: ...
+
     # Picks blobstore client to use with current release.
     #
     # @return [Bosh::Blobstore::Client] blobstore client
@@ -73,12 +97,12 @@ module Bosh::Cli
       provider = blobstore_config["provider"]
       options  = blobstore_config["options"] || {}
 
-      if has_blobstore_secret?
-        options["secret"] = @private_config["blobstore_secret"]
-      end
+      deprecate_blobstore_secret if has_legacy_secret?
+
+      options = merge_private_data(provider, options)
 
-      @blobstore = Bosh::Blobstore::Client.create(provider,
-                                                  symbolize_keys(options))
+      opts = Bosh::Common.symbolize_keys(options)
+      @blobstore = Bosh::Blobstore::Client.create(provider, opts)
 
     rescue Bosh::Blobstore::BlobstoreError => e
       err("Cannot initialize blobstore: #{e}")
@@ -97,6 +121,34 @@ module Bosh::Cli
 
     private
 
+    def has_blobstore_secrets?(blobstore, name, *keys)
+      return false unless blobstore
+      return false unless blobstore[name]
+      keys.each {|key| return false unless blobstore[name][key]}
+      true
+    end
+
+
+    # Extracts private blobstore data from final.yml (i.e. secrets)
+    # and merges it into the blobstore options.
+    def merge_private_data(provider, options)
+      bs = @private_config["blobstore"]
+      options.merge(bs ? bs[provider] : {})
+    end
+
+    # stores blobstore_secret as blobstore.atmos.secret
+    def deprecate_blobstore_secret
+      say("WARNING:".red + " use of blobstore_secret is deprecated")
+
+      @private_config["blobstore"] ||= {}
+      bs = @private_config["blobstore"]
+
+      bs["atmos"] ||= {}
+      atmos = bs["atmos"]
+
+      atmos["secret"] = @private_config["blobstore_secret"]
+    end
+
     # Upgrade path for legacy clients that kept release metadata
     # in config/dev.yml and config/final.yml
     #
@@ -156,13 +208,6 @@ module Bosh::Cli
       end
     end
 
-    def symbolize_keys(hash)
-      hash.inject({}) do |h, (key, value)|
-        h[key.to_sym] = value
-        h
-      end
-    end
-
     def load_config(file)
       if File.exists?(file)
         load_yaml_file(file)

data/lib/cli/runner.rb

@@ -34,16 +34,16 @@ module Bosh::Cli
 
     def prepare
       define_commands
-      define_plugin_commands
-      build_parse_tree
-      add_shortcuts
       parse_options!
-
+      Config.output ||= STDOUT unless @options[:quiet]
       Config.interactive = !@options[:non_interactive]
       Config.colorize = @options.delete(:colorize)
-      Config.output ||= STDOUT unless @options[:quiet]
       Config.cache = Bosh::Cli::Cache.new(@options[:cache_dir] ||
                                             Bosh::Cli::DEFAULT_CACHE_DIR)
+
+      define_plugin_commands
+      build_parse_tree
+      add_shortcuts
     end
 
     def run
@@ -144,7 +144,7 @@ module Bosh::Cli
 
     # for use with:
     # complete -C 'bosh complete' bosh
-    # @param [String] command line (minus "bosh")
+    # @param [String] line command line (minus "bosh")
     # @return [Array]
     def complete(line)
       words = line.split(/\s+/)
@@ -234,6 +234,12 @@ module Bosh::Cli
         route  :deployment, :perform
       end
 
+      command :edit_deployment do
+        usage  "edit deployment"
+        desc   "Edit current deployment manifest"
+        route  :deployment, :edit
+      end
+
       command :ssh do
         usage "ssh <job> [index] [<options>] [command]"
         desc  "Given a job, execute the given command or " +
@@ -592,7 +598,23 @@ module Bosh::Cli
       end
 
       def define_plugin_commands
-        Gem.find_files("bosh/cli/commands/*.rb", true).each do |file|
+        plugins_glob = "bosh/cli/commands/*.rb"
+
+        unless Gem.respond_to?(:find_files)
+          say("Cannot load plugins, ".yellow +
+              "please run `gem update --system' to ".yellow +
+              "update your RubyGems".yellow)
+          return
+        end
+
+        plugins = begin
+          Gem.find_files(plugins_glob, true)
+        rescue ArgumentError
+          # Handling rubygems compatibility issue
+          Gem.find_files(plugins_glob)
+        end
+
+        plugins.each do |file|
           class_name = File.basename(file, ".rb").capitalize
 
           next if Bosh::Cli::Command.const_defined?(class_name)

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19.5"
+    VERSION = "0.19.6"
   end
 end

data/spec/assets/config/atmos/config/final.yml

@@ -0,0 +1,6 @@
+---
+blobstore:
+  provider: atmos
+  options:
+    uid: bosh
+    secret: foo

data/spec/assets/config/atmos/config/private.yml

@@ -0,0 +1,4 @@
+---
+blobstore:
+  atmos:
+    secret: bar

data/spec/assets/config/deprecation/config/final.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  provider: atmos
+  options:
+    uid: bosh

data/spec/assets/config/deprecation/config/private.yml

@@ -0,0 +1,2 @@
+---
+blobstore_secret: bar

data/spec/assets/config/s3/config/final.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  provider: s3
+  options:
+    bucket_name: test

data/spec/assets/config/s3/config/private.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  s3:
+    secret_access_key: foo
+    access_key_id: bar

data/spec/unit/base_command_spec.rb

@@ -26,7 +26,7 @@ describe Bosh::Cli::Command::Base do
     cmd = make_command(:verbose => true, :dry_run => true)
     cmd.verbose?.should be_true
     cmd.dry_run?.should be_true
-    cmd.target.should == "localhost:8080"
+    cmd.target.should == "http://localhost:8080"
     cmd.deployment.should == "test"
     cmd.username.should == nil
     cmd.password.should == nil
@@ -54,7 +54,7 @@ describe Bosh::Cli::Command::Base do
 
     add_config("target" => "localhost:8080", "deployment" => "test")
     cmd2 = make_command(:target => "foo", :deployment => "bar")
-    cmd2.target.should == "foo"
+    cmd2.target.should == "http://foo:25555"
     cmd2.deployment.should == "bar"
   end
 
@@ -62,7 +62,7 @@ describe Bosh::Cli::Command::Base do
     add_config("target" => "localhost:8080", "deployment" => "test")
 
     cmd = make_command
-    cmd.director.director_uri.should == "localhost:8080"
+    cmd.director.director_uri.should == "http://localhost:8080"
   end
 
   it "can evaluate other commands" do

data/spec/unit/release_spec.rb

@@ -63,4 +63,39 @@ describe Bosh::Cli::Release do
     r.final_name.should be_nil
     r.min_cli_version.should be_nil
   end
+
+  describe "merging final.yml with private.yml" do
+    it "should print a warning when it contains blobstore_secret" do
+      r = Bosh::Cli::Release.new(spec_asset("config/deprecation"))
+      opts = {
+          :uid => "bosh",
+          :secret => "bar"
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("atmos", opts)
+      r.should_receive(:say)
+
+      r.blobstore
+    end
+
+    it "should merge s3 secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/s3"))
+      opts = {
+          :bucket_name => "test",
+          :secret_access_key => "foo",
+          :access_key_id => "bar"
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("s3", opts)
+      r.blobstore
+    end
+
+    it "should merge atmos secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/atmos"))
+      opts = {
+          :uid => "bosh",
+          :secret => "bar"
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("atmos", opts)
+      r.blobstore
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.19.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,12 @@ files:
 - spec/assets/biff/no_subnet_config.yml
 - spec/assets/biff/ok_network_config.yml
 - spec/assets/biff/properties_template.erb
+- spec/assets/config/atmos/config/final.yml
+- spec/assets/config/atmos/config/private.yml
+- spec/assets/config/deprecation/config/final.yml
+- spec/assets/config/deprecation/config/private.yml
+- spec/assets/config/s3/config/final.yml
+- spec/assets/config/s3/config/private.yml
 - spec/assets/deployment.MF
 - spec/assets/plugins/bosh/cli/commands/echo.rb
 - spec/assets/plugins/bosh/cli/commands/ruby.rb
@@ -319,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1133822301070881682
+      hash: -389599683879577066
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -328,10 +334,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1133822301070881682
+      hash: -389599683879577066
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BOSH CLI
@@ -348,6 +354,12 @@ test_files:
 - spec/assets/biff/no_subnet_config.yml
 - spec/assets/biff/ok_network_config.yml
 - spec/assets/biff/properties_template.erb
+- spec/assets/config/atmos/config/final.yml
+- spec/assets/config/atmos/config/private.yml
+- spec/assets/config/deprecation/config/final.yml
+- spec/assets/config/deprecation/config/private.yml
+- spec/assets/config/s3/config/final.yml
+- spec/assets/config/s3/config/private.yml
 - spec/assets/deployment.MF
 - spec/assets/plugins/bosh/cli/commands/echo.rb
 - spec/assets/plugins/bosh/cli/commands/ruby.rb