rbld 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab06977050419017e9293fc7add885a3474ded72
-  data.tar.gz: 777845489d399990b3942c2d70df0fbf42bd32d3
+  metadata.gz: 52af85fe8048b73c2ec54a99f10a301b3e53d068
+  data.tar.gz: 27c99030446802b42462fed1ccd05d3599257ac3
 SHA512:
-  metadata.gz: 36db91de99ee92c41d64b6f1b684edaa539c3e76c1ba0cec9fb91b50af40f074f57f2ff4c148b5ae71f785330412ebbbe1b96f54e1d484ed6508f4ed0950087e
-  data.tar.gz: 066ccf5ce3425c76784e4c2cca7bd90c5030076f106e56969a1444130955197d4341d5d00436969a6551be2ca6024406188ba1faef4ac12cca979a34cf95efde
+  metadata.gz: 59f37575451ae36fb42b35d0d03f2206e68ef43be2cdc59ddadce167811a650ea45506529fdc6d981189c96d433bbc996f32841b4bd271a1eb8f09d81af29fd0
+  data.tar.gz: 8ec25e4ee262fef7f77dd4503e31d98fb05ba5d3eec5b1e969dc34d53ead3151553747cda04eaa80660f086158daaade7279dabb295047cf536871ba041fe151

data/cli/bin/rbld

@@ -5,12 +5,15 @@ require 'require_all'
 module Rebuild
   require_relative '../lib/rbld_commands'
   require_rel '../lib/commands'
+  require_relative '../lib/rbld_plugins'
 end
 
 begin
 
   rbld_log.info( "ARGV: #{ARGV.join(' ')}" )
 
+  Rebuild::PlugMgr.instance.notify(:start)
+
   if !ARGV[0] || (ARGV[0] == "help" && !ARGV[1])
     puts Rebuild::CLI::Main.usage
     puts
@@ -33,4 +36,8 @@ rescue StandardError => e
   rbld_print.error(e.message)
   e.backtrace.each { |l| rbld_log.fatal(l) }
   exit 1
+rescue SignalException => e
+  rbld_print.error("Command execution was terminated.")
+  e.backtrace.each { |l| rbld_log.fatal(l) }
+  exit 2
 end

data/cli/lib/data/version

@@ -1 +1 @@
-1.2.0
+1.3.0

data/cli/lib/rbld_dockerops.rb

@@ -43,7 +43,7 @@ module Rebuild
       def get_credential(name, is_secret = false)
         print "#{name}: "
         predefined = ENV["RBLD_CREDENTIAL_#{name.upcase}"]
-        if predefined
+        unless predefined.to_s.empty?
           puts "<environment>"
           predefined
         else
@@ -119,7 +119,7 @@ module Rebuild
         case @last_error
           when nil
             # No error
-          when /authentication required/, /unauthorized/
+          when /authentication required/, /unauthorized/, /denied/
             raise RegistryNotAuthenticatedError, @last_error
           else
             raise RegistryOperationError, @last_error

data/cli/lib/rbld_fileops.rb

@@ -15,23 +15,21 @@ module Rebuild::Engine
     end
 
     def load!
-      begin
-        with_gzip_reader { |gz| Docker::Image.load(gz) }
+      with_gzip_reader { |gz| Docker::Image.load(gz) }
+
       rescue => msg
         rbld_print.trace( msg )
         raise EnvironmentLoadFailure, @filename
-      end
     end
 
     def save!(name, identity)
-      begin
-        with_gzip_writer do |gz|
-          Docker::Image.save_stream( identity ) { |chunk| gz.write chunk }
-        end
+      with_gzip_writer do |gz|
+        Docker::Image.save_stream( identity ) { |chunk| gz.write chunk }
+      end
+
       rescue => msg
         rbld_print.trace( msg )
         raise EnvironmentSaveFailure, [name, @filename]
-      end
     end
 
     private
@@ -42,7 +40,7 @@ module Rebuild::Engine
           f.binmode
           gz = Zlib::GzipWriter.new(f)
           begin
-            yield gz
+            yield Rebuild::Utils::WithProgressBar.new( gz, :write )
           ensure
             gz.close
           end
@@ -56,7 +54,7 @@ module Rebuild::Engine
     def with_gzip_reader
       Zlib::GzipReader.open( @filename ) do |gz|
         begin
-          yield gz
+          yield Rebuild::Utils::WithProgressBar.new( gz, :read )
         ensure
           gz.close
         end

data/cli/lib/rbld_plugins.rb

@@ -0,0 +1,42 @@
+require 'singleton'
+require 'plugman'
+
+class Rebuild::PlugMgr
+
+  include Singleton
+  extend Forwardable
+
+  def_delegator :@plugman, :notify
+
+  private
+
+  def initialize
+    @plugman = Plugman.new( loader: loader )
+    @plugman.load_plugins
+  end
+
+  def loader
+    ->(a) do
+      plugins.each { |p| load( p ) }
+    end
+  end
+
+  def plugins
+    Gem::Specification.\
+      map { |g| g.name }.\
+      sort.\
+      uniq.\
+      grep /^rbld-plugin-.*/
+    end
+
+  def load(plugin)
+
+    require plugin
+
+    rescue LoadError
+      rbld_log.warn( "Failed to load plugin #{plugin}" )
+    else
+      rbld_log.info( "Loaded plugin #{plugin}" )
+  end
+
+end

data/cli/lib/rbld_reg_dockerhub.rb

@@ -55,6 +55,10 @@ module Rebuild
         end
       end
 
+      def search_repos
+        @index.search( @path ).map( &:name ).find_all { |n| n.start_with?("#{@path}/") }
+      end
+
       def search(name = nil, tag = nil)
         rbld_log.info( "Searching for #{name}:#{tag}" )
 

data/cli/lib/rbld_reg_fs.rb

@@ -16,7 +16,7 @@ module Rebuild
       def initialize(path)
         @path = path
         rbld_log.info( "Connecting to registry #{@path}" )
-        raise FSLookupError, @remote unless Dir.exists?( @path )
+        raise FSLookupError, @path unless Dir.exists?( @path )
       end
 
       def search(name = nil, tag = nil)
@@ -53,7 +53,7 @@ module Rebuild
       def deploy(name, tag, api_class = ::Docker::Image)
         reg_file = File.join( @path, name, tag ) + FILE_SFX
         rbld_log.info( "Pulling from #{@path}" )
-        ef = Rebuild::Engine::EnvironmentFile.new(reg_file).load!
+        Rebuild::Engine::EnvironmentFile.new(reg_file).load!
       end
 
     end

data/cli/lib/rbld_utils.rb

@@ -1,3 +1,6 @@
+require 'delegate'
+require 'ruby-progressbar'
+
 module Rebuild
   module Utils
 
@@ -50,5 +53,60 @@ module Rebuild
 
       alias rebuild_error rebuild_errors
     end
+
+    class StopWatch
+      def restart
+        @start_time = Time.now
+      end
+
+      alias_method :initialize, :restart
+
+      def time_ms
+        (Time.now - @start_time).to_i * 1000
+      end
+    end
+
+    class WithProgressBar < SimpleDelegator
+      def initialize(target, methods = [], progressbar_class = ProgressBar, console_obj = STDOUT)
+        if console_obj.tty?
+          __init_progress__( progressbar_class, console_obj )
+          methods = [ methods ] unless methods.respond_to? :each
+          methods.each { |m| __create_hook__( m ) }
+        end
+
+        super(target)
+      end
+
+      private
+
+      def __init_progress__(progressbar_class, console_obj)
+        @__progressbar__ = progressbar_class.create(title: 'Working',
+                                                    length: 60,
+                                                    total: nil,
+                                                    output: console_obj)
+        @__stopwatch__ = StopWatch.new
+        @__first_call__ = true
+      end
+
+      def __create_hook__(name)
+        instance_eval(
+          %Q{
+              def #{name}(*args)
+                __do_tick__
+                super
+              end
+            }
+        )
+      end
+
+      def __do_tick__(*args)
+        if @__first_call__ || @__stopwatch__.time_ms >= 200
+          @__progressbar__.increment
+          @__stopwatch__.restart
+          @__first_call__ = false
+        end
+      end
+    end
+
   end
 end

data/tools/rebuild-conf/Rakefile

@@ -15,6 +15,11 @@ CONF_CONTENTS = <<TEXT
 #REMOTE_NAME=origin
 #REMOTE_TYPE_origin="rebuild"
 #REMOTE_origin="/mnt/rbld_regsitry_root"
+
+#For Docker Hub
+REMOTE_NAME=origin
+REMOTE_TYPE_origin="dockerhub"
+REMOTE_origin="rbld/environments"
 TEXT
 
 task default: [RBLD_CONF]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -166,6 +166,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: plugman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +326,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: Zero-dependency, reproducible build environments
 email: rbld-devel@rbld.io
 executables:
@@ -320,6 +380,7 @@ files:
 - cli/lib/rbld_engine.rb
 - cli/lib/rbld_fileops.rb
 - cli/lib/rbld_log.rb
+- cli/lib/rbld_plugins.rb
 - cli/lib/rbld_print.rb
 - cli/lib/rbld_reg_docker.rb
 - cli/lib/rbld_reg_dockerhub.rb
@@ -350,5 +411,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: rbld-1.2.0
+summary: rbld-1.3.0
 test_files: []