bosh-gen 0.91.0 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1dc07f603102568ae5b087023b5dec4b2b9d5f7
-  data.tar.gz: a8a9f437abf3cdc25cde0b616e959aaa9f2c786f
+  metadata.gz: 668c75ea5ea57e96a2d20915d4d4aaecd773e3c0
+  data.tar.gz: e9bf3dc769566c2dc6b2d00e153ea76484e2ae87
 SHA512:
-  metadata.gz: f0e869917407870d4d9ec67220f47992c88be509d9a1b2145fa748fc39ae95f61a2538611c375948f40740327575357b51c0b9f6c4e14d99b56899f62f84b2aa
-  data.tar.gz: 780f1dff3a9ca3f19bc63e47e12e272580b957e50163c5f90cc28d49621386106fd3a016fb59ac3b63ac3390a624f67a7f049409ad3a8a791f2b59387a36cbbd
+  metadata.gz: 64875d8d16a32845aba49811e9d0f1bb7137cea9ffab4fd58f31a925f951ee2f5c81892107437e1794aa6ff43d585b99f27ecbe17b20af81b60ad8cad24fcd91
+  data.tar.gz: 8579d65a33f5450fc5822e4e81c97514a2130388a2071900072c4987da4670a151e4492f6d0b6216ecefd4b623f5965925f90a0d53b634399654e4fcee7a47a2

data/Gemfile

@@ -6,7 +6,3 @@ gemspec
 if File.directory?("../cyoi")
   gem "cyoi", path: "../cyoi"
 end
-
-gem 'bosh_cli', '~> 1.1750'
-
-gem 'guard-rspec'

data/Rakefile

@@ -1,13 +1,2 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-
-require "rspec/core/rake_task"
-
-
-desc "Run Tests"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = "spec/{generators,models}/**/*_spec.rb"
-  t.rspec_opts = %w(--format progress --color)
-end
-
-task :default => :spec

data/bosh-gen.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Bosh::Gen::VERSION
 
   gem.add_dependency "thor"
-  gem.add_dependency "bosh_cli"
-  gem.add_dependency "bosh-template"
   gem.add_dependency "progressbar"
 
   gem.add_dependency "cyoi", "~> 0.10"
@@ -28,5 +26,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", ">= 4.0", "< 5.0"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec-fire"
 end

data/lib/bosh/gen/bosh-config.rb

@@ -0,0 +1,274 @@
+module Bosh; end
+module Bosh::Cli
+  class Config
+    VALID_ID = /^[-a-z0-9_.]+$/i
+
+    class << self
+      # @return [Hash<String,Bosh::Cli::CommandDefinition>] Available commands
+      attr_reader :commands
+
+      # @return [Boolean] Should CLI output be colorized?
+      attr_accessor :colorize
+
+      # @return [IO] Where output goes
+      attr_accessor :output
+
+      # @return [Boolean] Is CLI being used interactively?
+      attr_accessor :interactive
+
+      # @return [Integer] CLI polling interval
+      attr_accessor :poll_interval
+
+      # @return [Integer] CLI max parallel downloads
+      attr_accessor :max_parallel_downloads
+    end
+
+    @commands = {}
+    @colorize = nil
+    @output = nil
+    @interactive = false
+
+    # Register command with BOSH CLI
+    # @param [Bosh::Cli::CommandDefinition] command
+    # @return [void]
+    def self.register_command(command)
+      if @commands.has_key?(command.usage)
+        raise CliError, "Duplicate command '#{command.usage}'"
+      end
+      @commands[command.usage] = command
+    end
+
+    def self.use_color?
+      # colorization explicitly enabled, or output is tty
+      return false if Bosh::Cli::Config.colorize == false
+
+      # colorization explicitly enabled, or output is tty
+      Bosh::Cli::Config.colorize || Bosh::Cli::Config.output.tty?
+    end
+
+    def initialize(filename, work_dir = Dir.pwd)
+      @filename = File.expand_path(filename || Bosh::Cli::DEFAULT_CONFIG_PATH)
+      @work_dir = work_dir
+
+      unless File.exists?(@filename)
+        File.open(@filename, "w") { |f| Psych.dump({}, f) }
+        File.chmod(0600, @filename)
+      end
+
+      @config_file = load_yaml_file(@filename, nil)
+
+      unless @config_file.is_a?(Hash)
+        @config_file = {} # Just ignore it if it's malformed
+      end
+
+    rescue SystemCallError => e
+      raise ConfigError, "Cannot read config file: #{e.message}"
+    end
+
+    # @return [Hash] Director credentials
+    def credentials_for(target)
+      if @config_file["auth"].is_a?(Hash) && @config_file["auth"][target]
+        @config_file["auth"][target]
+      else
+        {
+          "username" => nil,
+          "password" => nil
+        }
+      end
+    end
+
+    def set_credentials(target, credentials)
+      @config_file["auth"] ||= {}
+      @config_file["auth"][target] = credentials
+    end
+
+    def set_alias(category, alias_name, value)
+      @config_file["aliases"] ||= {}
+      @config_file["aliases"][category.to_s] ||= {}
+      @config_file["aliases"][category.to_s][alias_name] = value
+    end
+
+    def aliases(category)
+      if @config_file.has_key?("aliases") && @config_file["aliases"].is_a?(Hash)
+        @config_file["aliases"][category.to_s]
+      else
+        nil
+      end
+    end
+
+    def resolve_alias(category, alias_name)
+      category = category.to_s
+
+      if @config_file.has_key?("aliases") &&
+          @config_file["aliases"].is_a?(Hash) &&
+          @config_file["aliases"].has_key?(category) &&
+          @config_file["aliases"][category].is_a?(Hash) &&
+          !@config_file["aliases"][category][alias_name].blank?
+        @config_file["aliases"][category][alias_name].to_s
+      else
+        nil
+      end
+    end
+
+    # @param [String] target Target director url
+    # @return [String] Username associated with target
+    def username(target)
+      credentials_for(target)["username"]
+    end
+
+    # @param [String] target Target director url
+    # @return [String] Password associated with target
+    def password(target)
+      credentials_for(target)["password"]
+    end
+
+    # @param [String] target Target director url
+    # @return [String] Token associated with target
+    def access_token(target)
+      credentials_for(target)["access_token"]
+    end
+
+    # @param [String] target Target director url
+    # @return [String] Refresh token associated with target
+    def refresh_token(target)
+      credentials_for(target)["refresh_token"]
+    end
+
+    # Deployment used to be a string that was only stored for your
+    # current target. As soon as you switched targets, the deployment
+    # was erased. If the user has the old config we convert it to the
+    # new config.
+    #
+    # @return [Boolean] Whether config is using the old deployment format.
+    def is_old_deployment_config?
+      @config_file["deployment"].is_a?(String)
+    end
+
+    # Read the deployment configuration.  Return the deployment for the
+    # current target.
+    #
+    # @return [String?] The deployment path for the current target.
+    def deployment
+      return nil if target.nil?
+      if @config_file.has_key?("deployment")
+        if is_old_deployment_config?
+          set_deployment(@config_file["deployment"])
+          save
+        end
+        if @config_file["deployment"].is_a?(Hash)
+          return @config_file["deployment"][target]
+        end
+      end
+    end
+
+    # Sets the deployment file for the current target. If the deployment is
+    # the old deployment configuration, it will turn it into the format.
+    #
+    # @raise [MissingTarget] If there is no target set.
+    # @param [String] deployment_file_path The string path to the
+    #     deployment file.
+    def set_deployment(deployment_file_path)
+      raise MissingTarget, "Must have a target set" if target.nil?
+      @config_file["deployment"] = {} if is_old_deployment_config?
+      @config_file["deployment"] ||= {}
+      @config_file["deployment"][target] = deployment_file_path
+    end
+
+    def target
+      read(:target, false)
+    end
+
+    def target=(value)
+      write_global(:target, value)
+    end
+
+    def target_name
+      read(:target_name, false)
+    end
+
+    def target_name=(value)
+      write_global(:target_name, value)
+    end
+
+    def target_version
+      read(:target_version, false)
+    end
+
+    def target_version=(value)
+      write_global(:target_version, value)
+    end
+
+    def release
+      read(:release, false)
+    end
+
+    def release=(value)
+      write_global(:release, value)
+    end
+
+    def target_uuid
+      read(:target_uuid, false)
+    end
+
+    def target_uuid=(value)
+      write_global(:target_uuid, value)
+    end
+
+    def ca_cert(for_target=nil)
+      if for_target
+        return @config_file.fetch('ca_cert', {}).fetch(for_target, nil)
+      end
+
+      return nil if target.nil?
+
+      @config_file.fetch('ca_cert', {}).fetch(target, nil)
+    end
+
+
+    def save_ca_cert_path(cert_path, for_target=nil)
+      expanded_path = cert_path ? File.expand_path(cert_path) : nil
+      cert_target = for_target || target
+      @config_file['ca_cert'] ||= {}
+      @config_file['ca_cert'][cert_target] = expanded_path
+
+      expanded_path
+    end
+
+    # Read the max parallel downloads configuration.
+    #
+    # @return [Integer] The maximum number of parallel downloads
+    def max_parallel_downloads
+      self.class.max_parallel_downloads || @config_file.fetch("max_parallel_downloads", 1)
+    end
+
+    def read(attr, try_local_first = true)
+      attr = attr.to_s
+      if try_local_first && @config_file[@work_dir].is_a?(Hash) &&
+          @config_file[@work_dir].has_key?(attr)
+        @config_file[@work_dir][attr]
+      else
+        @config_file[attr]
+      end
+    end
+
+    def write(attr, value)
+      @config_file[@work_dir] ||= {}
+      @config_file[@work_dir][attr.to_s] = value
+    end
+
+    def write_global(attr, value)
+      @config_file[attr.to_s] = value
+    end
+
+    def save
+      File.open(@filename, "w") do |f|
+        Psych.dump(@config_file, f)
+      end
+
+    rescue SystemCallError => e
+      raise ConfigError, e.message
+    end
+
+    attr_reader :filename
+  end
+end

data/lib/bosh/gen/cli.rb

@@ -1,9 +1,7 @@
 require "thor"
 
-# bosh_cli libraries
-module Bosh; end
-require "cli/config"
-require "cli/core_ext"
+require "bosh/gen/bosh-config"
+require "bosh/gen/core-ext"
 
 module Bosh
   module Gen

data/lib/bosh/gen/core-ext.rb

@@ -0,0 +1,185 @@
+module BoshExtensions
+
+  def say(message, sep = "\n")
+    return unless Bosh::Cli::Config.output && message
+    message = message.dup.to_s
+    sep = "" if message[-1] == sep
+    Bosh::Cli::Config.output.print("#{$indent}#{message}#{sep}")
+  end
+
+  def with_indent(indent)
+    old_indent, $indent = $indent, old_indent.to_s + indent.to_s
+    yield
+  ensure
+    $indent = old_indent
+  end
+
+  def header(message, filler = '-')
+    say("\n")
+    say(message)
+    say(filler.to_s * message.size)
+  end
+
+  def nl(count = 1)
+    say("\n" * count)
+  end
+
+  def err_nl
+    warn('')
+  end
+
+  def err(message)
+    raise Bosh::Cli::CliError, message
+  end
+
+  def quit(message = nil)
+    say(message)
+    raise Bosh::Cli::GracefulExit, message
+  end
+
+  def blank?
+    self.to_s.blank?
+  end
+
+  def pretty_size(what, prec=1)
+    if what.is_a?(String) && File.exists?(what)
+      size = File.size(what)
+    else
+      size = what.to_i
+    end
+
+    return "NA" unless size
+    return "#{size}B" if size < 1024
+    return sprintf("%.#{prec}fK", size/1024.0) if size < (1024*1024)
+    if size < (1024*1024*1024)
+      return sprintf("%.#{prec}fM", size/(1024.0*1024.0))
+    end
+    sprintf("%.#{prec}fG", size/(1024.0*1024.0*1024.0))
+  end
+
+  def pluralize(number, singular, plural = nil)
+    plural = plural || "#{singular}s"
+    number == 1 ? "1 #{singular}" : "#{number} #{plural}"
+  end
+
+  def format_time(time)
+    ts = time.to_i
+    sprintf("%02d:%02d:%02d", ts / 3600, (ts / 60) % 60, ts % 60);
+  end
+
+  def load_yaml_file(path, expected_type = Hash)
+    yaml_str = read_yaml_file(path)
+
+    yaml = Psych::load(yaml_str)
+    if expected_type && !yaml.is_a?(expected_type)
+      err("Incorrect YAML structure in '#{path}': expected #{expected_type} at the root".make_red)
+    end
+
+    yaml
+  end
+
+  def read_yaml_file(path)
+    err("Cannot find file '#{path}'".make_red) unless File.exist?(path)
+
+    begin
+      yaml_str = ERB.new(File.read(path)).result
+    rescue SystemCallError => e
+      err("Cannot load YAML file at '#{path}': #{e}".make_red)
+    end
+
+    begin
+      Bosh::Cli::YamlHelper.check_duplicate_keys(yaml_str)
+    rescue Exception => e # on ruby 1.9.3 Psych::SyntaxError isn't a StandardError
+      err("Incorrect YAML structure in '#{path}': #{e}".make_red)
+    end
+    yaml_str
+  end
+
+  def write_yaml(manifest, path)
+    File.open(path, "w+") do |f|
+      f.write(manifest.to_yaml)
+    end
+  end
+
+  # @return [Fixnum]
+  def terminal_width
+    STDIN.tty? ? [HighLine::SystemExtensions.terminal_size[0], 120].min : 80
+  end
+
+  def warning(message)
+    warn("[WARNING] #{message}".make_yellow)
+  end
+end
+
+module BoshStringExtensions
+
+  COLOR_CODES = {
+    :red => "\e[0m\e[31m",
+    :green => "\e[0m\e[32m",
+    :yellow => "\e[0m\e[33m"
+  }
+
+  def make_red
+    make_color(:red)
+  end
+
+  def make_green
+    make_color(:green)
+  end
+
+  def make_yellow
+    make_color(:yellow)
+  end
+
+  def make_color(color_code)
+    # invalid color
+    return self if !COLOR_CODES[color_code]
+
+    # output disabled
+    return self if !Bosh::Cli::Config.output
+
+    if Bosh::Cli::Config.use_color?
+      "#{COLOR_CODES[color_code]}#{self}\e[0m"
+    else
+      self
+    end
+  end
+
+  def blank?
+    self =~ /^\s*$/
+  end
+
+  def bosh_valid_id?
+    !!(self =~ Bosh::Cli::Config::VALID_ID)
+  end
+
+  def truncate(limit = 30)
+    return "" if self.blank?
+    etc = "..."
+    stripped = self.strip[0..limit]
+    if stripped.length > limit
+      stripped.gsub(/\s+?(\S+)?$/, "") + etc
+    else
+      stripped
+    end
+  end
+
+  def columnize(width = 80, left_margin = 0)
+    Bosh::Cli::LineWrap.new(width, left_margin).wrap(self)
+  end
+
+  def indent(margin = 2)
+    self.split("\n").map { |line|
+      " " * margin + line
+    }.join("\n")
+  end
+
+end
+
+class Object
+  include BoshExtensions
+end
+
+class String
+  include BoshStringExtensions
+end

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.91.0"
+    VERSION = "0.92.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.92.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bosh_cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bosh-template
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +142,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-fire
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Generators for creating BOSH releases
 email:
 - drnicwilliams@gmail.com
@@ -193,17 +151,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ChangeLog.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/bosh-gen
 - bosh-gen.gemspec
 - lib/bosh/gen.rb
+- lib/bosh/gen/bosh-config.rb
 - lib/bosh/gen/cli.rb
+- lib/bosh/gen/core-ext.rb
 - lib/bosh/gen/generators/blacksmith_forge_generator.rb
 - lib/bosh/gen/generators/blacksmith_forge_generator/templates/.gitkeep
 - lib/bosh/gen/generators/blacksmith_forge_generator/templates/jobs/%job_name%/monit.tt

data/.rspec

@@ -1,3 +0,0 @@
---format progress
---color
---require spec_helper

data/Guardfile

@@ -1,5 +0,0 @@
-guard 'rspec', spec_paths: ["spec"] do
-  watch(%r{^spec/(.+_spec)\.rb$})
-  watch(%r{^lib/bosh/gen/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end