master_delivery 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96b7a6e293146f06482ae8ee3f286b970ba9c0410697ed5634d2bacb4efc907
-  data.tar.gz: ab74ed9c5b3498778d26bae2fc9a8eaab8c4075bd9b124293bd9213a439db9bc
+  metadata.gz: d57694762f369b51254410b1275d131512d6ee485a7ead16ad8287e8ace819a5
+  data.tar.gz: 1adbdc9c1b0340d42c9c226b6ea6a7b82fb1954b6fb280cbf8e8f1b8778e8712
 SHA512:
-  metadata.gz: 714ee4ae4fc50a90e93ba853262b9aa3a197134c6b649fdc3815854c70db39b84e14faef62982c29c7767787de95927697613fadd45afbb1e35385039b8db1dc
-  data.tar.gz: c5b463336afde3099108678a7235d4f6242b6cc5374b4c365716a724424b4deb967a5c5c5e492e64d1f9828729a376d0e3c6a5582ab9f5c187bc2e41ac5a571a
+  metadata.gz: dcd1c969e89bc5224b898acc9081ed95e9ce5cddd14ef4a7c26cf56d68e07f864a61ac948d69c76d61dc0c7a50a2ade1ec41ab7b39a9704c27fe96dfe1331a6e
+  data.tar.gz: aa87c276ff2bbc72c0b5fe3e8e0fd14c820b9afa2917f531dadc5e965c529303365940c01bb35f7666e93b3737c304e21c94fcd29321ec27570124628d9a5507

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v1.0.5](https://github.com/shinyaohtani/master_delivery/tree/v1.0.5) (2020-05-03)
+
+[Full Changelog](https://github.com/shinyaohtani/master_delivery/compare/v1.0.4...v1.0.5)
+
+- fixed pathname to clean '//' etc.
+
+**Fixed bugs:**
+
+- Avoid slash duplication of delivery\_root when -d '/' [\#10](https://github.com/shinyaohtani/master_delivery/issues/10)
+
+**Merged pull requests:**
+
+- fixed path'//' using pathname.cleanpath [\#20](https://github.com/shinyaohtani/master_delivery/pull/20) ([shinyaohtani](https://github.com/shinyaohtani))
+
 ## [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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    master_delivery (1.0.4)
+    master_delivery (1.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -63,7 +63,7 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.19.1)
-    parser (2.7.1.1)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     protocol-hpack (1.4.2)
     protocol-http (0.18.0)
@@ -87,15 +87,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
     rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -106,7 +106,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     sawyer (0.8.2)

data/lib/cli_master_delivery.rb

@@ -5,6 +5,7 @@
 module MasterDelivery
   require 'master_delivery'
   require 'optparse'
+  require 'pathname'
 
   DESC_MASTER_DIR = <<~MASTER
     Master snapshot directory. All master files in this
@@ -87,9 +88,10 @@ module MasterDelivery
     def run
       return unless check_param_consistency
 
-      master_dir = File.expand_path(@params[:master])
-      md = MasterDelivery.new(File.dirname(master_dir), @params[:backup])
-      arg_set = [File.basename(master_dir), @params[:delivery]]
+      fix_param_paths(%i[master delivery backup])
+      master = @params[:master]
+      md = MasterDelivery.new(File.dirname(master), @params[:backup])
+      arg_set = [File.basename(master), @params[:delivery]]
       return unless md.confirm(*arg_set, @params.slice(:type, :quiet, :dryrun, :yes))
 
       md.deliver(*arg_set, **@params.slice(:type, :dryrun))
@@ -201,5 +203,17 @@ module MasterDelivery
       puts "Invalid arguments are given: #{ARGV}"
       false
     end
+
+    def fix_param_paths(options)
+      options.each do |opt|
+        @params[opt] = fix_path_format(@params[opt])
+      end
+    end
+
+    def fix_path_format(param_path)
+      return param_path if !param_path.nil? && !param_path.empty?
+
+      Pathname.new(File.expand_path(param_path)).cleanpath.to_s
+    end
   end
 end

data/lib/master_delivery.rb

@@ -6,6 +6,7 @@ require 'master_delivery/version'
 module MasterDelivery
   require 'fileutils'
   require 'find'
+  require 'pathname'
   require 'tmpdir'
   MSG_CONFIRMATION_INTRO = <<~CONFIRM_INTRO
 
@@ -147,11 +148,13 @@ module MasterDelivery
     end
 
     def backup_file_path(master, master_id, backup_dir)
-      File.expand_path(backup_dir) + relative_master_path(master, master_id)
+      path = File.expand_path(backup_dir) + relative_master_path(master, master_id)
+      Pathname.new(path).cleanpath.to_s
     end
 
     def target_file_path(master, master_id, target_prefix)
-      relative_master_path(master, master_id).prepend(File.expand_path(target_prefix))
+      path = relative_master_path(master, master_id).prepend(File.expand_path(target_prefix))
+      Pathname.new(path).cleanpath.to_s
     end
   end
 end

data/lib/master_delivery/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MasterDelivery
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_delivery
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Shinya Ohtani (shinyaohtani@github)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler