rbld 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a5ab4410529f2d2b3482b9d732b08044f5f3de
-  data.tar.gz: ba25955d34d8888761ebd233728ada0cfcca0178
+  metadata.gz: af4c9a4b60e224f583ee1d28dd42857fdcc54e9d
+  data.tar.gz: b612db6e20afda3953b864471b4a16aaf156a09d
 SHA512:
-  metadata.gz: 26cd599a7e8003b475b7a209cac0bccc61ce35e6307e735db5eaa0c6ce47d950105f21fc1ca9a02a15f300db239c12bf0fab8df956ffa1442b0b08df9bef57a2
-  data.tar.gz: e9d7a83df474d789a99a9498e79a44f0575899e4cc0a3246a232f763182e1239534db0f79adf1229b5f4cb018321dbb9a62fc658dd52270335bb25b98e4b1b56
+  metadata.gz: 0ece06c55791cc848a4ee3a9e0b64e84438258665006da01bb0f15dfbd1aa17821ff5dfc3bb2c9a2fc01df0d431d9bac7a9a84e2f16a428df2f5331b8015ba17
+  data.tar.gz: 55fb1f5974359592a05e8b3cec4ca3e039cb1ca036146eb56fb72a7884f4200396ce7dec537622c38e319734e9480a9dc5c3f430415d890f988ce249ff15ee16

data/cli/lib/commands/rbld_rm.rb

@@ -1,14 +1,37 @@
 module Rebuild::CLI
   class RbldRmCommand < Command
     def initialize
-      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]"
-      @description = "Remove local environment"
+      @usage = "[OPTIONS] [ENVIRONMENT[:TAG]]... -- COMMANDS"
+      @description = "Remove one or more local environments"
+      @options = [
+                  ["-f, --force", "force remove modified environments"]
+                 ]
+    end
+
+    def parse_opts(parameters)
+      replace_argv( parameters ) do
+        opts = GetoptLong.new([ '--force', '-f', GetoptLong::NO_ARGUMENT ])
+        runopts = {}
+        opts.each do |opt, arg|
+          case opt
+          when '--force'
+            runopts[:force] = true
+          end
+        end
+        return runopts, ARGV
+      end
     end
 
     def run(parameters)
-      env = Environment.new( parameters[0] )
-      rbld_log.info("Going to remove #{env}")
-      engine_api.remove!( env )
+      runopts, parameters = parse_opts( parameters )
+      raise EnvironmentNameEmpty unless parameters.any?
+      parameters.each do |parameter|
+        env = Environment.new( parameter )
+        rbld_log.info("Going to checkout #{env} before removal")
+        engine_api.checkout!( env ) if runopts[:force]
+        rbld_log.info("Going to remove #{env}")
+        engine_api.remove!( env )
+      end
     end
   end
 end

data/cli/lib/data/version

@@ -1 +1 @@
-1.3.7
+1.3.8

data/cli/lib/rbld_engine.rb

@@ -288,7 +288,7 @@ module Rebuild::Engine
   rebuild_errors \
    UnsupportedDockerService: 'Unsupported docker service: %s',
    InaccessibleDockerService: 'Unable to reach the docker engine',
-   EnvironmentIsModified: 'Environment is modified, commit or checkout first',
+   EnvironmentIsModified: 'Environment is modified, %s',
    EnvironmentNotKnown: 'Unknown environment %s',
    NoChangesToCommit: 'No changes to commit for %s',
    EnvironmentDeploymentFailure: 'Failed to deploy from %s',
@@ -454,6 +454,8 @@ module Rebuild::Engine
 
   class API
     extend Forwardable
+    REMOVE_MODIFIED_ERROR = 'use --force to delete anyway'
+    PUBLISH_MODIFIED_ERROR = 'commit or checkout first'
 
     def initialize(docker_api = Docker, cfg = Rebuild::Config.new)
       @docker_api, @cfg = docker_api, cfg
@@ -465,7 +467,7 @@ module Rebuild::Engine
     end
 
     def remove!(env_name)
-      env = unmodified_env( env_name )
+      env = unmodified_env( env_name , REMOVE_MODIFIED_ERROR )
       env.img.remove!
       @cache.refresh!
     end
@@ -523,7 +525,7 @@ module Rebuild::Engine
     end
 
     def publish(env_name)
-      env = unmodified_env( env_name )
+      env = unmodified_env( env_name, PUBLISH_MODIFIED_ERROR )
 
       rbld_print.progress "Checking for collisions..."
 
@@ -765,9 +767,9 @@ module Rebuild::Engine
       env
     end
 
-    def unmodified_env(name)
+    def unmodified_env(name, comment)
       env = existing_env( name )
-      raise EnvironmentIsModified if env.modified?
+      raise EnvironmentIsModified, comment if env.modified?
       env
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -171,9 +171,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
@@ -181,9 +178,6 @@ dependencies:
   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
@@ -260,6 +254,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: aruba-win-fix
   requirement: !ruby/object:Gem::Requirement
@@ -486,5 +500,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: rbld-1.3.7
+summary: rbld-1.3.8
 test_files: []