rbld 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afda56780e000dda2179af1fe6559382551926cf
-  data.tar.gz: 2e54d8682d9933871bf202f9584b916b4eb82dc2
+  metadata.gz: 7bca62e00fbf523630f21ac49a64c278f42aa5ac
+  data.tar.gz: 7f6ae20c007bbedd9a33a35aeb158902ba44e571
 SHA512:
-  metadata.gz: d761dbb46e55ad337b0d60eab6d9e49e4fb49c8d15d612aa568c11303023dccfaefae4abc3136476a52676081669b26de3272782079e43df7af7317f6539b644
-  data.tar.gz: 2a5029cdd031099585f9a817abe818b8f56f8c583da781619c3f9a2fcd0d82e2a816363e59644313adac6b3b5f9eb25f16fbcf4b713036d243c665ec06c5d1ea
+  metadata.gz: f695830b29a3552f3061d3471c4b1be9e484baa30414ba067bdcc6b3b95b82f75083a5ad98ab7393692bc5c997b7dde723c4230e60465fbb5b9651a6c2da954b
+  data.tar.gz: 5006deaf0ee6253247dc1e9709ab6bd8a73355985e494aa3c678990260ad9fd4c4617aba10075c2770479b5c15612922553513f05f19a516367965c5ae14e939

data/cli/lib/commands/rbld_checkout.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldCheckoutCommand < Command
     def initialize
-      @usage = "checkout [OPTIONS] [ENVIRONMENT[:TAG]]"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
       @description = "Discard environment modifications"
     end
 

data/cli/lib/commands/rbld_commit.rb

@@ -3,7 +3,7 @@ require 'getoptlong'
 module Rebuild::CLI
   class RbldCommitCommand < Command
     def initialize
-      @usage = "commit [OPTIONS] [ENVIRONMENT[:TAG]]"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
       @description = "Commit environment modifications"
       @options = [["-t TAG,--tag TAG", "New tag to be created"]]
     end

data/cli/lib/commands/rbld_create.rb

@@ -3,7 +3,7 @@ require 'getoptlong'
 module Rebuild::CLI
   class RbldCreateCommand < Command
     def initialize
-      @usage = "create [OPTIONS] [ENVIRONMENT]"
+      @usage = "[OPTIONS] [ENVIRONMENT]"
       @description = "Create a new environment"
       @options = [
                   ["-b NAME, --base NAME", "Base image from Docker Hub"],

data/cli/lib/commands/rbld_deploy.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldDeployCommand < Command
     def initialize
-      @usage = "deploy [OPTIONS] [ENVIRONMENT[:TAG]]"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
       @description = "Deploy environment from remote registry"
     end
 

data/cli/lib/commands/rbld_list.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldListCommand < Command
     def initialize
-      @usage = "list [OPTIONS]"
+      @usage = "[OPTIONS]"
       @description = "List local environments"
     end
 

data/cli/lib/commands/rbld_load.rb

@@ -9,7 +9,7 @@ module Rebuild::CLI
     public
 
     def initialize
-      @usage = "load [OPTIONS] [FILE]"
+      @usage = "[OPTIONS] [FILE]"
       @description = "Load environment from file"
     end
 

data/cli/lib/commands/rbld_modify.rb

@@ -5,10 +5,10 @@ module Rebuild::CLI
 
     def initialize
       @usage = [
-                { :syntax => "modify [OPTIONS] [ENVIRONMENT[:TAG]]",
+                { :syntax => "[OPTIONS] [ENVIRONMENT[:TAG]]",
                   :description => "Interactive mode: opens shell in the " \
                                   "specified enviroment" },
-                { :syntax => "modify [OPTIONS] [ENVIRONMENT[:TAG]] -- COMMANDS",
+                { :syntax => "[OPTIONS] [ENVIRONMENT[:TAG]] -- COMMANDS",
                   :description => "Scripting mode: runs COMMANDS in the " \
                                   "specified environment" }
                ]

data/cli/lib/commands/rbld_publish.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldPublishCommand < Command
     def initialize
-      @usage = "publish [OPTIONS] [ENVIRONMENT[:TAG]]"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
       @description = "Publish environment on remote registry"
     end
 

data/cli/lib/commands/rbld_rm.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldRmCommand < Command
     def initialize
-      @usage = "rm [OPTIONS] [ENVIRONMENT[:TAG]]"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
       @description = "Remove local environment"
     end
 

data/cli/lib/commands/rbld_run.rb

@@ -5,10 +5,10 @@ module Rebuild::CLI
 
     def initialize
       @usage = [
-                { :syntax => "run [OPTIONS] [ENVIRONMENT[:TAG]]",
+                { :syntax => "[OPTIONS] [ENVIRONMENT[:TAG]]",
                   :description => "Interactive mode: opens shell in the " \
                                   "specified enviroment" },
-                { :syntax => "run [OPTIONS] [ENVIRONMENT[:TAG]] -- COMMANDS",
+                { :syntax => "[OPTIONS] [ENVIRONMENT[:TAG]] -- COMMANDS",
                   :description => "Scripting mode: runs COMMANDS in the " \
                                   "specified environment" }
                ]

data/cli/lib/commands/rbld_save.rb

@@ -9,7 +9,7 @@ module Rebuild::CLI
     public
 
     def initialize
-      @usage = "save [OPTIONS] [ENVIRONMENT] [FILE]"
+      @usage = "[OPTIONS] [ENVIRONMENT] [FILE]"
       @description = "Save local environment to file"
     end
 

data/cli/lib/commands/rbld_search.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldSearchCommand < Command
     def initialize
-      @usage = "search [OPTIONS] [NAME[:TAG]|PREFIX]"
+      @usage = "[OPTIONS] [NAME[:TAG]|PREFIX]"
       @description = "Search remote registry for published environments"
     end
 

data/cli/lib/commands/rbld_status.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldStatusCommand < Command
     def initialize
-      @usage = "status [OPTIONS]"
+      @usage = "[OPTIONS]"
       @description = "List modified environments"
     end
 

data/cli/lib/commands/rbld_version.rb

@@ -1,7 +1,7 @@
 module Rebuild::CLI
   class RbldVersionCommand < Command
     def initialize
-      @usage = "version [OPTIONS]"
+      @usage = "[OPTIONS]"
       @description = "Show the Rebuild version information"
     end
 

data/cli/lib/data/version

@@ -1 +1 @@
-1.3.2
+1.3.3

data/cli/lib/rbld_commands.rb

@@ -120,6 +120,10 @@ module Rebuild::CLI
       rbld_log.info( "Command handler class #{handler_class} registered" )
     end
 
+    def cmd_name
+      @cmd_name ||= Commands.deduce_cmd_name( self.class )
+    end
+
     def options_text
       options = (@options || []) + [["-h, --help", "Print usage"]]
       text = ""
@@ -163,11 +167,11 @@ module Rebuild::CLI
       if @usage.respond_to?(:each)
         text << "\n"
         @usage.each do |mode|
-          text << "\n  rbld #{mode[:syntax]}\n\n" \
+          text << "\n  rbld #{cmd_name} #{mode[:syntax]}\n\n" \
                   "    #{mode[:description]}\n"
         end
       else
-        text << "rbld #{@usage}\n"
+        text << "rbld #{cmd_name} #{@usage}\n"
       end
       text
     end

data/cli/lib/rbld_dockerops.rb

@@ -1,7 +1,7 @@
 require 'docker_registry2'
 require_relative 'rbld_log'
 require_relative 'rbld_utils'
-require 'fancy_gets'
+require 'highline'
 
 module Rebuild
   module Registry
@@ -13,8 +13,6 @@ module Rebuild
       RegistryNotAuthenticatedError: nil
 
     class EnvironmentImage
-      include FancyGets
-
       def initialize(api_module = ::Docker)
         @api_module = api_module
       end
@@ -40,6 +38,10 @@ module Rebuild
         end
       end
 
+      def get_password
+        HighLine.new($stdin, $stderr).ask('') { |q| q.echo = '*' }
+      end
+
       def get_credential(name, is_secret = false)
         print "#{name}: "
         predefined = ENV["RBLD_CREDENTIAL_#{name.upcase}"]
@@ -47,7 +49,7 @@ module Rebuild
           puts "<environment>"
           predefined
         else
-          is_secret ? gets_password : STDIN.gets.chomp
+          is_secret ? get_password : STDIN.gets.chomp
         end
       end
 

data/cli/lib/rbld_plugins.rb

@@ -33,8 +33,8 @@ class Rebuild::PlugMgr
 
     require plugin
 
-    rescue LoadError
-      rbld_log.warn( "Failed to load plugin #{plugin}" )
+  rescue LoadError => e
+      rbld_log.warn( "Failed to load plugin #{plugin}: #{e}" )
     else
       rbld_log.info( "Loaded plugin #{plugin}" )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -147,25 +147,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
-  name: fancy_gets_ex
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: Zero-dependency, reproducible build environments
 email: rbld-devel@rbld.io
 executables:
@@ -411,5 +431,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: rbld-1.3.2
+summary: rbld-1.3.3
 test_files: []