bricolage 5.26.0 → 5.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7331a52e0d7ce7f6e37a033455c4bbd0cd20ec98
-  data.tar.gz: 8c794e3df428209e2467e8edd7dca371d109eb17
+  metadata.gz: 7e3dbe169737e338845aaed2828c95b55fbddd74
+  data.tar.gz: 78cff717b492a0f5074b43f472507b5491fe7d4b
 SHA512:
-  metadata.gz: 8f58e1983098afd0dace568e5f32e415e12e50e39be6a04502ef9cab9347c1325370c4304de4859d481d2b1ad5246aeaf816bc7971ca7f5adb0747f1af47ad19
-  data.tar.gz: c9831a9e1c8f5694654e69ed695f8886db98b3fe46e9a8ef7384a9f120bd8890e2557a14f90318665f0ad713cb087b6ce1ae103e9943c55aef98eb71ac684ff8
+  metadata.gz: a1205c5dac00149fffd45895c85441408a03413ee127a992d533d1e53dde81864143e1e9fd159ac78a61ea4c13f2215eed1561f66de738139cbd0b5ce8ec0af2
+  data.tar.gz: 6aa81f8e1332132ffc8ee171ee8964340b7a3583c77aa8bb8143c1a567673fb38c3885da299a60c08a9d34845bbfce3838c3579ab03f510f7e39a627483307cf

data/lib/bricolage/jobnetrunner.rb

@@ -12,6 +12,7 @@ require 'bricolage/loglocatorbuilder'
 require 'bricolage/logger'
 require 'bricolage/exception'
 require 'bricolage/version'
+require 'fileutils'
 require 'pathname'
 require 'optparse'
 
@@ -53,6 +54,10 @@ module Bricolage
         exit EXIT_SUCCESS
       end
 
+      if opts.clear_queue?
+        clear_queue(opts)
+        exit EXIT_SUCCESS
+      end
       queue = get_queue(opts)
       if queue.locked?
         raise ParameterError, "Job queue is still locked. If you are sure to restart jobnet, #{queue.unlock_help}"
@@ -86,6 +91,12 @@ module Bricolage
       @ctx.logger
     end
 
+    def clear_queue(opts)
+      if path = get_queue_file_path(opts)
+        FileUtils.rm_f path
+      end
+    end
+
     def get_queue(opts)
       if path = get_queue_file_path(opts)
         logger.info "queue path: #{path}"
@@ -206,6 +217,7 @@ module Bricolage
         @dump_options = false
         @check_only = false
         @list_jobs = false
+        @clear_queue = false
 
         init_options
       end
@@ -253,6 +265,12 @@ Options:
         parser.on('-Q', '--enable-queue', 'Enables job queue.') {
           @opts_cmdline['enable-queue'] = OptionValue.new('--enable-queue option', true)
         }
+        parser.on('--disable-queue', 'Disables job queue.') {
+          @opts_cmdline['enable-queue'] = OptionValue.new('--disable-queue option', false)
+        }
+        parser.on('--clear-queue', 'Clears job queue and quit.') {
+          @clear_queue = true
+        }
         parser.on('--queue-path=PATH', 'Enables job queue with this path.') {|path|
           @opts_cmdline['queue-path'] = OptionValue.new('--queue-path option', path)
         }
@@ -331,6 +349,10 @@ Options:
         end
       end
 
+      def clear_queue?
+        @clear_queue
+      end
+
       def option_pairs
         common_options.merge({
           'environment' => OptionValue.new(nil, @environment)

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.26.0'
+  VERSION = '5.27.0'
 end

data/test/home/Gemfile.lock

@@ -1,21 +1,7 @@
-PATH
-  remote: ../../../bricolage-mysql
-  specs:
-    bricolage-mysql (5.26.0)
-      bricolage (>= 5.26.0)
-      mysql2
-
-PATH
-  remote: ../../../bricolage-redis
-  specs:
-    bricolage-redis (5.26.0)
-      bricolage (>= 5.26.0)
-      redis (~> 3)
-
 PATH
   remote: ../..
   specs:
-    bricolage (5.26.0)
+    bricolage (5.27.0)
       aws-sdk-s3 (~> 1)
       aws-sdk-sns (~> 1)
       pg (~> 0.18.0)
@@ -42,20 +28,16 @@ GEM
     coderay (1.1.2)
     jmespath (1.3.1)
     method_source (0.9.0)
-    mysql2 (0.4.10)
     pg (0.18.4)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    redis (3.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bricolage!
-  bricolage-mysql!
-  bricolage-redis!
   pry
 
 BUNDLED WITH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.26.0
+  version: 5.27.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -111,8 +111,8 @@ dependencies:
 description: Redshift-oriented Data Warehouse Batch Framework
 email: aamine@loveruby.net
 executables:
-- bricolage
 - bricolage-jobnet
+- bricolage
 extensions: []
 extra_rdoc_files: []
 files: