master_delivery 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd9a6ebb7e41f0328c46e274a36d8a0baf7e4b1549e0f88865bfcdae47462ec
-  data.tar.gz: 23dff41dd71f145e7bf5f3b835e049080d6ce210784b859a301f7c40aed1af2e
+  metadata.gz: c96b7a6e293146f06482ae8ee3f286b970ba9c0410697ed5634d2bacb4efc907
+  data.tar.gz: ab74ed9c5b3498778d26bae2fc9a8eaab8c4075bd9b124293bd9213a439db9bc
 SHA512:
-  metadata.gz: 2b486c93913a8b1c7a572eb5fae14fb394a9ea94f4da36ffccf3fe0acdaeee70adef7addafbfa856b35e7eb22d5030308c6413e34a1caf88ecf584944151866c
-  data.tar.gz: 8155f6027b8af3e52ed1728f71dfc7a91d46f1e1e48f1fe8f47cef92a484db116b038dbf1cdf81d57de161019a260155580134f73f4168d7aad62c64e0d0abad
+  metadata.gz: 714ee4ae4fc50a90e93ba853262b9aa3a197134c6b649fdc3815854c70db39b84e14faef62982c29c7767787de95927697613fadd45afbb1e35385039b8db1dc
+  data.tar.gz: c5b463336afde3099108678a7235d4f6242b6cc5374b4c365716a724424b4deb967a5c5c5e492e64d1f9828729a376d0e3c6a5582ab9f5c187bc2e41ac5a571a

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v1.0.4](https://github.com/shinyaohtani/master_delivery/tree/v1.0.4) (2020-04-28)
+
+[Full Changelog](https://github.com/shinyaohtani/master_delivery/compare/v1.0.3...v1.0.4)
+
+- fixed: skip confirmation option didn't work
+
+**Fixed bugs:**
+
+- skip\_confirmation does not work on v1.0.3 [\#15](https://github.com/shinyaohtani/master_delivery/issues/15)
+
+**Merged pull requests:**
+
+- fixed skip confirmation option [\#16](https://github.com/shinyaohtani/master_delivery/pull/16) ([shinyaohtani](https://github.com/shinyaohtani))
+
 ## [v1.0.3](https://github.com/shinyaohtani/master_delivery/tree/v1.0.3) (2020-04-28)
 
 [Full Changelog](https://github.com/shinyaohtani/master_delivery/compare/v1.0.2...v1.0.3)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    master_delivery (1.0.3)
+    master_delivery (1.0.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/cli_master_delivery.rb

@@ -90,9 +90,9 @@ module MasterDelivery
       master_dir = File.expand_path(@params[:master])
       md = MasterDelivery.new(File.dirname(master_dir), @params[:backup])
       arg_set = [File.basename(master_dir), @params[:delivery]]
-      return unless md.confirm(*arg_set, **(@params.slice(:type, :quiet, :dryrun, :skip_conf)))
+      return unless md.confirm(*arg_set, @params.slice(:type, :quiet, :dryrun, :yes))
 
-      md.deliver(*arg_set, **(@params.slice(:type, :dryrun)))
+      md.deliver(*arg_set, **@params.slice(:type, :dryrun))
       puts 'done!' unless @params[:quiet]
     end
 

data/lib/master_delivery.rb

@@ -69,16 +69,15 @@ module MasterDelivery
       backup_dir
     end
 
-    def confirm(master_id, target_prefix, 
-                type: :symbolic_link, dryrun: false, skip_conf: false, quiet: false)
-
-      unless quiet
-        puts MSG_CONFIRMATION_INTRO unless skip_conf
-        print_params(master_id, target_prefix, type: type, dryrun: dryrun)
+    # @param params [Hash] :type, :dryrun, :yes, :quiet
+    def confirm(master_id, target_prefix, params)
+      unless params[:quiet]
+        puts MSG_CONFIRMATION_INTRO unless params[:yes]
+        print_params(master_id, target_prefix, params.slice(:type, :dryrun))
         print_sample(master_id, target_prefix)
       end
-      print MSG_CONFIRMATION.chomp unless skip_conf # use print instead of puts for '\n'
-      return true if skip_conf || gets.chomp == 'y'
+      print MSG_CONFIRMATION.chomp unless params[:yes] # use print instead of puts for '\n'
+      return true if params[:yes] || gets.chomp == 'y'
 
       puts 'aborted.'
       false
@@ -107,13 +106,14 @@ module MasterDelivery
       end
     end
 
-    def print_params(master_id, target_prefix, type:, dryrun:)
+    # @param params [Hash] :type, :dryrun
+    def print_params(master_id, target_prefix, params)
       mfiles = master_files(master_id)
       msg =  "(-m) MASTER_DIR:   -m #{@master_root}/#{master_id} (#{mfiles.size} master files)\n"
       msg += "(-d) DELIVER_ROOT: -d #{File.expand_path(target_prefix)}\n"
-      msg += "(-t) DELIVER_TYPE: -t #{type}\n"
+      msg += "(-t) DELIVER_TYPE: -t #{params[:type]}\n"
       msg += "(-b) BACKUP_ROOT:  -b #{@backup_root}\n"
-      msg += "(-D) DRYRUN:       #{dryrun ? '--dryrun' : '--no-dryrun'}\n"
+      msg += "(-D) DRYRUN:       #{params[:dryrun] ? '--dryrun' : '--no-dryrun'}\n"
       puts msg
     end
 

data/lib/master_delivery/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MasterDelivery
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   DESCRIPTION = <<~DESC
     Deliver all master files managed in a single master snapshot directory
     into the specified directory while maintaining the hierarchy of the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_delivery
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Shinya Ohtani (shinyaohtani@github)