rbld 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d269e8517d0c5d51573433ed718b7a97fb9c89
-  data.tar.gz: 5664d2ca28b6ae3e53597c756cd3156878b959c3
+  metadata.gz: d227fefcee50eefa5f3d6bfa353ada39b2ca01af
+  data.tar.gz: 8ac255f0c137b88e4ba6d38d43f3c6dd4d26ff7d
 SHA512:
-  metadata.gz: cd5a400e66efb95db58de1b73d4f999c4c2ad22113e4c67fb756195004a933842a049bda5449d38b30c1cd19b2e4b1beb519bc74caa6ede10dbe07365bd9dd5d
-  data.tar.gz: 5a61db1f9b6422e3d1f61fc14488a9890f1028d23b67eeb66d5800f471cc2d050b805cbdcc6ec276e2f18aac64f794906883bad149d53d4066166fc19cd387ee
+  metadata.gz: c6d267b8044f72f2fa02ab7768eca155bb9555945707858da17e884a76f46c0d32c1243f0774aac6448bcf8824a3b375390241dbfd88f1fdb73234a6a720ebeb
+  data.tar.gz: e124388ec7544bb4c7fe5b5457db4faffa90f6fa4b914c49759b4e60452a59476d6821e1aef2dec22dde51e0e64df088f132c19b1cef996e69103bce7c1c9c15

data/cli/lib/commands/rbld_deploy.rb

@@ -7,7 +7,6 @@ module Rebuild::CLI
 
     def run(parameters)
       env = Environment.new( parameters[0] )
-      cmd = get_cmdline_tail( parameters )
       rbld_log.info("Going to deploy \"#{env}\"")
       engine_api.deploy!( env )
       rbld_print.progress "Successfully deployed #{env}\n"

data/cli/lib/commands/rbld_modify.rb

@@ -1,5 +1,8 @@
 module Rebuild::CLI
   class RbldModifyCommand < Command
+
+    include RunOptions
+
     def initialize
       @usage = [
                 { :syntax => "modify [OPTIONS] [ENVIRONMENT[:TAG]]",
@@ -10,13 +13,15 @@ module Rebuild::CLI
                                   "specified environment" }
                ]
       @description = "Modify a local environment"
+      @options = opts_text
     end
 
     def run(parameters)
+      runopts, parameters = parse_opts( parameters )
       env = Environment.new( parameters.shift )
       cmd = get_cmdline_tail( parameters )
       rbld_log.info("Going to modify \"#{env}\" with \"#{cmd}\"")
-      @errno = engine_api.modify!( env, cmd )
+      @errno = engine_api.modify!( env, cmd, runopts )
     end
   end
 end

data/cli/lib/commands/rbld_run.rb

@@ -1,5 +1,8 @@
 module Rebuild::CLI
   class RbldRunCommand < Command
+
+    include RunOptions
+
     def initialize
       @usage = [
                 { :syntax => "run [OPTIONS] [ENVIRONMENT[:TAG]]",
@@ -10,15 +13,17 @@ module Rebuild::CLI
                                   "specified environment" }
                ]
       @description = "Run command in a local environment"
+      @options = opts_text
     end
 
     def run(parameters)
+      runopts, parameters = parse_opts( parameters )
       env = Environment.new( parameters.shift )
       cmd = get_cmdline_tail( parameters )
       rbld_log.info("Going to run \"#{cmd}\" in \"#{env}\"")
 
       warn_if_modified( env, 'running' )
-      @errno = engine_api.run( env, cmd )
+      @errno = engine_api.run( env, cmd, runopts )
     end
   end
 end

data/cli/lib/commands/rbld_version.rb

@@ -0,0 +1,12 @@
+module Rebuild::CLI
+  class RbldVersionCommand < Command
+    def initialize
+      @usage = "version [OPTIONS]"
+      @description = "Show the Rebuild version information"
+    end
+
+    def run(parameters)
+      puts "Rebuild CLI version #{Rebuild::Version.info}"
+    end
+  end
+end

data/cli/lib/data/version

@@ -0,0 +1 @@
+1.1.0

data/cli/lib/rbld_commands.rb

@@ -1,5 +1,6 @@
 require_relative 'rbld_log'
 require_relative 'rbld_utils'
+require_relative 'rbld_verinfo'
 require_relative 'rbld_engine'
 
 module Rebuild::CLI
@@ -184,6 +185,27 @@ END_USAGE
     end
   end
 
+  module RunOptions
+    def opts_text
+      [["-p, --privileged", "Run environment with superuser privileges"]]
+    end
+
+    def parse_opts(parameters)
+      replace_argv( parameters ) do
+        opts = GetoptLong.new([ '--privileged', '-p', GetoptLong::NO_ARGUMENT ])
+        runopts = {}
+        opts.each do |opt, arg|
+          case opt
+          when '--privileged'
+              runopts[:privileged] = true
+          end
+        end
+
+        return runopts, ARGV
+      end
+    end
+  end
+
   class Main
 
     def self.usage

data/cli/lib/rbld_config.rb

@@ -1,20 +1,40 @@
 require 'parseconfig'
 
 module Rebuild
+  class Remote
+    def initialize(cfg)
+      return unless cfg
+
+      if @name = cfg['REMOTE_NAME']
+        @type = cfg["REMOTE_TYPE_#{@name}"]
+        @path = cfg["REMOTE_#{@name}"]
+      end
+    end
+
+    def validate!
+      unless @valid
+        raise 'Remote not defined' unless @name
+        raise 'Remote type not defined' unless @type
+        raise 'Remote location not defined' unless @path
+
+        @valid = true
+      end
+
+      self
+    end
+
+    attr_reader :name, :type, :path
+  end
+
   class Config
     def initialize()
       cfg_file = File.join( Dir.home, '.rbld', 'rebuild.conf' )
-
-      if File.exist?( cfg_file )
-        cfg = ParseConfig.new( cfg_file )
-        rname = cfg['REMOTE_NAME']
-        @remote = rname ? cfg["REMOTE_#{rname}"] : nil
-      end
+      cfg = File.exist?( cfg_file ) ? ParseConfig.new( cfg_file ) : nil
+      @remote = Remote.new( cfg )
     end
 
     def remote!
-      raise 'Remote not defined' unless @remote
-      @remote
+      @remote.validate!
     end
   end
 end

data/cli/lib/rbld_engine.rb

@@ -7,7 +7,9 @@ require_relative 'rbld_log'
 require_relative 'rbld_config'
 require_relative 'rbld_utils'
 require_relative 'rbld_print'
-require_relative 'rbld_registry'
+require_relative 'rbld_reg_docker'
+require_relative 'rbld_reg_fs'
+require_relative 'rbld_fileops'
 
 module Rebuild::Engine
   extend Rebuild::Utils::Errors
@@ -271,8 +273,6 @@ module Rebuild::Engine
    EnvironmentIsModified: 'Environment is modified, commit or checkout first',
    EnvironmentNotKnown: 'Unknown environment %s',
    NoChangesToCommit: 'No changes to commit for %s',
-   EnvironmentLoadFailure: 'Failed to load environment from %s',
-   EnvironmentSaveFailure: 'Failed to save environment %s to %s',
    EnvironmentDeploymentFailure: 'Failed to deploy from %s',
    EnvironmentAlreadyExists: 'Environment %s already exists',
    EnvironmentNotFoundInTheRegistry: 'Environment %s does not exist in the registry',
@@ -281,61 +281,6 @@ module Rebuild::Engine
    EnvironmentPublishFailure: 'Failed to publish on %s',
    EnvironmentCreateFailure: 'Failed to create %s'
 
-  class EnvironmentFile
-    def initialize(filename, docker_api = Docker)
-      @filename, @docker_api = filename, docker_api
-    end
-
-    def load!
-      begin
-        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
-      rescue => msg
-        rbld_print.trace( msg )
-        raise EnvironmentSaveFailure, [name, @filename]
-      end
-    end
-
-    private
-
-    def with_gzip_writer
-      begin
-        File.open(@filename, 'w') do |f|
-          f.binmode
-          gz = Zlib::GzipWriter.new(f)
-          begin
-            yield gz
-          ensure
-            gz.close
-          end
-        end
-      rescue
-        FileUtils::safe_unlink( @filename )
-        raise
-      end
-    end
-
-    def with_gzip_reader
-      Zlib::GzipReader.open( @filename ) do |gz|
-        begin
-          yield gz
-        ensure
-          gz.close
-        end
-      end
-    end
-  end
-
   class DockerContext
     def self.from_file(file)
       base = %Q{
@@ -501,13 +446,13 @@ module Rebuild::Engine
     end
 
     def search(env_name)
-      rbld_print.progress "Searching in #{@cfg.remote!}..."
+      rbld_print.progress "Searching in #{@cfg.remote!.path}..."
 
       begin
         registry.search( env_name.name, env_name.tag )
       rescue => msg
         rbld_print.trace( msg )
-        raise RegistrySearchFailed, @cfg.remote!
+        raise RegistrySearchFailed, @cfg.remote!.path
       end
     end
 
@@ -517,7 +462,7 @@ module Rebuild::Engine
       raise EnvironmentNotFoundInTheRegistry, env_name.full \
         if registry.search( env_name.name, env_name.tag ).empty?
 
-      rbld_print.progress "Deploying from #{@cfg.remote!}..."
+      rbld_print.progress "Deploying from #{@cfg.remote!.path}..."
 
       begin
        registry.deploy( env_name.name, env_name.tag ) do |img|
@@ -526,7 +471,7 @@ module Rebuild::Engine
        end
       rescue => msg
        rbld_print.trace( msg )
-       raise EnvironmentDeploymentFailure, @cfg.remote!
+       raise EnvironmentDeploymentFailure, @cfg.remote!.path
       end
 
       @cache.refresh!
@@ -541,33 +486,33 @@ module Rebuild::Engine
          unless registry.search( env_name.name, env_name.tag ).empty?
 
       begin
-        rbld_print.progress "Publishing on #{@cfg.remote!}..."
-        registry.publish( env.name, env.tag, env.img.api_obj )
+        rbld_print.progress "Publishing on #{@cfg.remote!.path}..."
+        registry.publish( env.name, env.tag, env.img )
       rescue => msg
         rbld_print.trace( msg )
-        raise EnvironmentPublishFailure, @cfg.remote!
+        raise EnvironmentPublishFailure, @cfg.remote!.path
       end
     end
 
-    def run(env_name, cmd)
+    def run(env_name, cmd, runopts = {})
       env = existing_env( env_name )
-      run_env_disposable( env, cmd )
+      run_env_disposable( env, cmd, runopts )
       @cache.refresh!
       @errno
     end
 
-    def modify!(env_name, cmd)
+    def modify!(env_name, cmd, runopts = {})
       env = existing_env( env_name )
 
       rbld_print.progress_start 'Initializing environment'
 
       if env.modified?
         rbld_log.info("Running container #{env.modification_container}")
-        rerun_modification_cont(env, cmd)
+        rerun_modification_cont(env, cmd, runopts)
       else
         rbld_log.info("Running environment #{env.img}")
         rbld_print.progress_end
-        run_env(env, cmd)
+        run_env(env, cmd, runopts)
       end
       @cache.refresh!
       @errno
@@ -667,8 +612,18 @@ module Rebuild::Engine
     end
 
     def registry
-      @registry ||= Rebuild::Registry::API.new( @cfg.remote! )
-      @registry
+      return @registry if @registry
+
+      case @cfg.remote!.type
+      when 'docker'
+        reg_module = Rebuild::Registry::Docker
+      when 'rebuild'
+        reg_module = Rebuild::Registry::FS
+      else
+        raise "Remote type #{@cfg.remote!.type} is unknown"
+      end
+
+      @registry = reg_module::API.new( @cfg.remote!.path )
     end
 
     def run_external(cmdline)
@@ -706,23 +661,23 @@ module Rebuild::Engine
           -e REBUILD_PWD=#{rs.pwd}                          \
           --security-opt label:disable                      \
           #{trace_run_settings}                             \
+          #{opts[:privileged] ? "--privileged" : ""}        \
           #{opts[:rerun] ? env.rerun_img.id : env.img.id}   \
           "#{cmd.join(' ')}"                                \
       }
     end
 
-    def run_env_disposable(env, cmd)
+    def run_env_disposable(env, cmd, runopts)
       env.execution_container.remove! if env.execution_container
       names = NameFactory.new(env)
 
       cmdline = %Q{
-        docker run                           \
-             --rm                            \
-             --name #{names.running}         \
-             --hostname #{names.hostname}    \
-             #{run_settings( env, cmd )}     \
+        docker run                                    \
+             --rm                                     \
+             --name #{names.running}                  \
+             --hostname #{names.hostname}             \
+             #{run_settings( env, cmd, runopts )}     \
       }
-
       run_external( cmdline )
     end
 
@@ -739,7 +694,7 @@ module Rebuild::Engine
       run_external( cmdline )
     end
 
-    def rerun_modification_cont(env, cmd)
+    def rerun_modification_cont(env, cmd, opts = {})
       rbld_print.progress_tick
 
       names = NameFactory.new( env )
@@ -754,7 +709,7 @@ module Rebuild::Engine
 
       @cache.refresh!
 
-      run_env( @cache.get(env), cmd, rerun: true )
+      run_env( @cache.get(env), cmd, opts.merge(rerun: true) )
     end
 
     def existing_env(name)

data/cli/lib/rbld_fileops.rb

@@ -0,0 +1,67 @@
+require 'docker'
+require_relative 'rbld_utils'
+require_relative 'rbld_print'
+
+module Rebuild::Engine
+  extend Rebuild::Utils::Errors
+
+  rebuild_errors \
+   EnvironmentLoadFailure: 'Failed to load environment from %s',
+   EnvironmentSaveFailure: 'Failed to save environment %s to %s'
+
+  class EnvironmentFile
+    def initialize(filename, docker_api = Docker)
+      @filename, @docker_api = filename, docker_api
+    end
+
+    def load!
+      begin
+        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
+      rescue => msg
+        rbld_print.trace( msg )
+        raise EnvironmentSaveFailure, [name, @filename]
+      end
+    end
+
+    private
+
+    def with_gzip_writer
+      begin
+        File.open(@filename, 'w') do |f|
+          f.binmode
+          gz = Zlib::GzipWriter.new(f)
+          begin
+            yield gz
+          ensure
+            gz.close
+          end
+        end
+      rescue
+        FileUtils::safe_unlink( @filename )
+        raise
+      end
+    end
+
+    def with_gzip_reader
+      Zlib::GzipReader.open( @filename ) do |gz|
+        begin
+          yield gz
+        ensure
+          gz.close
+        end
+      end
+    end
+  end
+
+end

data/cli/lib/{rbld_registry.rb → rbld_reg_docker.rb}

@@ -4,6 +4,7 @@ require_relative 'rbld_utils'
 
 module Rebuild
   module Registry
+  module Docker
     extend Rebuild::Utils::Errors
 
     rebuild_errors \
@@ -54,8 +55,9 @@ module Rebuild
         end.compact
       end
 
-      def publish(name, tag, api_obj)
+      def publish(name, tag, img)
         url = Entry.new( name, tag, @remote ).url
+        api_obj = img.api_obj
 
         api_obj.tag( repo: url.repo, tag: url.tag )
 
@@ -69,7 +71,7 @@ module Rebuild
         end
       end
 
-      def deploy(name, tag, api_class = Docker::Image)
+      def deploy(name, tag, api_class = ::Docker::Image)
         url = Entry.new( name, tag, @remote ).url
 
         begin
@@ -103,4 +105,5 @@ module Rebuild
       end
     end
   end
+  end
 end

data/cli/lib/rbld_reg_fs.rb

@@ -0,0 +1,62 @@
+require_relative 'rbld_log'
+require_relative 'rbld_utils'
+require_relative 'rbld_fileops'
+
+module Rebuild
+  module Registry
+  module FS
+    extend Rebuild::Utils::Errors
+
+    rebuild_error FSLookupError: 'Failed to access registry at %s'
+
+    class API
+      FILE_SFX = '.rbe'
+      private_constant :FILE_SFX
+
+      def initialize(path)
+        @path = path
+        rbld_log.info( "Connecting to registry #{@path}" )
+        raise FSLookupError, @remote unless Dir.exists?( @path )
+      end
+
+      def search(name = nil, tag = nil)
+        wildcard = File.join( tag.to_s.empty? ? ["#{name}*", '*' ] : [name, tag] ) + FILE_SFX
+
+        rbld_log.info( "Searching for #{wildcard}" )
+
+        Dir.glob( File.join( @path, wildcard ) ).map do |n|
+          pfx = File.join( @path,'' )
+          sfx = FILE_SFX
+          s = File::SEPARATOR
+          nametag = n.match( /^#{pfx}([^#{s}]+)#{s}([^#{s}]+)#{sfx}$/ ).captures
+          Rebuild::Utils::FullImageName.new( *nametag )
+        end
+      end
+
+      def publish(name, tag, img)
+        reg_dir = File.join( @path, name )
+        reg_file = File.join( reg_dir, tag ) + FILE_SFX
+
+        rbld_log.info( "Pushing to #{@path}" )
+
+        FileUtils.mkdir_p( File.join( reg_dir ) )
+
+        begin
+          ef = Rebuild::Engine::EnvironmentFile.new(reg_file)
+          ef.save!( Rebuild::Utils::FullImageName.new( name, tag ), img.identity )
+        rescue
+          FileUtils.rm_rf( reg_file )
+          raise
+        end
+      end
+
+      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!
+      end
+
+    end
+  end
+  end
+end

data/cli/lib/rbld_verinfo.rb

@@ -0,0 +1,19 @@
+module Rebuild
+  module Version
+    def self.retrieve_info
+      git_ver_script = File.expand_path("../../../tools/version.rb", __FILE__)
+      if File.exists?( git_ver_script )
+        require git_ver_script
+        rbld_version
+      else
+        File.read(File.expand_path("../data/version", __FILE__))
+      end
+    end
+
+    private_class_method :retrieve_info
+
+    def self.info
+      @ver ||= retrieve_info
+    end
+  end
+end

data/tools/rebuild-conf/Rakefile

@@ -2,8 +2,19 @@ CONF_DIR = File.join( Dir.home, '.rbld' )
 RBLD_CONF = File.expand_path( 'rebuild.conf', CONF_DIR )
 
 CONF_CONTENTS = <<TEXT
+#This is a sample config file for Rebuild
+#Uncomment and adjust following lines
+#according to your registry configuration
+
+#For Docker registries
 #REMOTE_NAME=origin
+#REMOTE_TYPE_origin="docker"
 #REMOTE_origin="10.0.110.110:5000"
+
+#For native Rebuild registry
+#REMOTE_NAME=origin
+#REMOTE_TYPE_origin="rebuild"
+#REMOTE_origin="/mnt/rbld_regsitry_root"
 TEXT
 
 task default: [RBLD_CONF]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -278,13 +278,18 @@ files:
 - cli/lib/commands/rbld_save.rb
 - cli/lib/commands/rbld_search.rb
 - cli/lib/commands/rbld_status.rb
+- cli/lib/commands/rbld_version.rb
+- cli/lib/data/version
 - cli/lib/rbld_commands.rb
 - cli/lib/rbld_config.rb
 - cli/lib/rbld_engine.rb
+- cli/lib/rbld_fileops.rb
 - cli/lib/rbld_log.rb
 - cli/lib/rbld_print.rb
-- cli/lib/rbld_registry.rb
+- cli/lib/rbld_reg_docker.rb
+- cli/lib/rbld_reg_fs.rb
 - cli/lib/rbld_utils.rb
+- cli/lib/rbld_verinfo.rb
 - tools/rebuild-conf/Rakefile
 homepage: http://rbld.io/
 licenses:
@@ -309,5 +314,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: rbld-1.0.2
+summary: rbld-1.1.0
 test_files: []