dcp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ae9bca889c34738a0c2ea78783c973b8d325280251def8ecd31c6fad8aaa16e
-  data.tar.gz: ee80f7c7f1eea995da97a767ed200ec40612c05b7d41d64500728cff0faab1b3
+  metadata.gz: 4a3684057e46d7a76afa18a87a847628f90296b7dbb923fb0b2a61317b53e45b
+  data.tar.gz: 407dba1947c83f8bd14ff46f5e57d180a46bfb13623cfe87acb5c47a8082934c
 SHA512:
-  metadata.gz: 9c629121e4db91bf98395c7b22a889c538be69d169194e252714ce6f470871b13c81865d8ff065ebbdc0011605c23fff6cd68be1f312feaf1cb80a5aebbcd632
-  data.tar.gz: ba481ad8eed77700f4701fb5aad056d9ad6d2696904c956d25e2bf43495fac4d1c08014b878a9916581eb84ea3724b8ad4d406e5a26c2e23352c4672b19f927e
+  metadata.gz: 280561df8444dac11ebd0988c40ad4b79ff85670b7d87f4a80c124427a3d94cb7fa19626be6d09830967508f652f57919bef4d92556cebda14b707388ed4f643
+  data.tar.gz: ea678ec17a77f65f56b07d835be75b17d4c83db9f7d559583fccb454e9deb2b4d06088038b8a44e944728f2fabfb6ddebb126c8209fb440da38ad482ff9aaa46

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dcp (0.2.0)
+    dcp (0.2.1)
       dropbox_api
       pit
 

data/README.md

@@ -8,11 +8,17 @@ copy files to/from dropbox like scp command
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+Usage: dcp [options] [db:]SRC [SRC...] [db:]DEST
+    -q, --quiet                      quiet mode
+    -h, --help                       print this messages
+```
+
+specify Dropbox path start with 'db:' or 'dropbox:'.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/exe/dcp

@@ -19,10 +19,9 @@ module DCP
 
 	class CLI
 		def run
-			opts, args = parse_options
-			dst = args.pop
+			@opts, args = parse_options
 			begin
-				precheck(args, dst)
+				pairs = make_pairs(args.pop, args)
 			rescue MultiError => e
 				e.messages.each{|m| error m}
 				exit 1
@@ -31,27 +30,29 @@ module DCP
 				exit 1
 			end
 			begin
-				dst = dst.chop if dst =~ /\/\z/ # root directory => ''
-				args.each do |src|
+				pairs.each do |src, dst|
+					puts "#{src} => #{dst}" if @opts[:debug]
 					open(src, 'r') do |r|
-						d = directory?(dst) ? "#{dst}/#{File.basename(src)}" : dst
-						open(d, 'w') do |w|
+						open(dst, 'w') do |w|
 							while data = r.read(10_000_000) do
 								w.write(data)
-								print '.' unless opts[:quiet]
+								print '.' unless @opts[:quiet]
 							end
 						end
-						puts unless opts[:quiet]
 					end
+					puts if @opts[:debug]
 				end
+				puts unless @opts[:quiet]
 			rescue => e
-				usage "#{e.message} (#{e.class})"
+				error "#{e.message} (#{e.class})"
+				exit 1
 			end
 		end
 
 	private
 		def error(msg)
 			$stderr.puts "dcp: #{msg}"
+			$@.each{|e| $stderr.puts e} if @opts[:debug]
 		end
 
 		def parse_options(argv = ARGV)
@@ -66,12 +67,16 @@ module DCP
 			end
 
 			opts = {
-				quiet: false
+				quiet: false,
+				debug: false
 			}
 
 			op.on('-q', '--quiet', "quiet mode") do
 				opts[:quiet] = true
 			end
+			op.on('-D', '--debug', "debug mode") do
+				opts[:debug] = true
+			end
 			op.on('-h', '--help', "print this messages") do
 				usage
 			end
@@ -120,8 +125,11 @@ module DCP
 			file.split(/:/, 2)[1]
 		end
 
-		def precheck(srcs, dst)
+		def make_pairs(dst, srcs)
 			errors = []
+			dst_is_directory = false
+
+			# cheking src file existance
 			srcs.each do |src|
 				begin
 					if dropbox_path?(src)
@@ -136,15 +144,33 @@ module DCP
 				end
 			end
 
+			# cheking dst file correctness
 			begin
-				if directory?(dst) && srcs.size > 1
-					errors << "cannot copy multiple files into a file: #{dst}"
+				d = dst =~ /\/\z/ ? dst.chop : dst # root directory => ''
+				if file?(d)
+					if srcs.size > 1
+						errors << "cannot copy multiple files into a file: #{dst}"
+					end
+				elsif directory?(d)
+					dst_is_directory = true
+				end
+			rescue Errno::ENOENT # check parent directory existance
+				begin
+					if directory?(File.dirname(d)) && srcs.size > 1
+						errors << "cannot copy multiple files into a file: #{dst}"
+					end
+				rescue Errno::ENOENT
+					errors << "file not found: #{dst}"
 				end
-			rescue Errno::ENOENT
-				errors << "file not found: #{dst}"
 			end
 
 			raise MultiError.new(errors) unless errors.empty?
+
+			if dst_is_directory
+				return srcs.map{|src| [src, "#{d}/#{File.basename(src)}"]}
+			else
+				return [[srcs[0], dst]]
+			end
 		end
 
 		def open(file, opts)
@@ -155,6 +181,14 @@ module DCP
 			end
 		end
 
+		def file?(file)
+			if dropbox_path?(file)
+				dropbox.file?(dropbox_path(file))
+			else
+				File.stat(file).file?
+			end
+		end
+
 		def directory?(file)
 			if dropbox_path?(file)
 				dropbox.directory?(dropbox_path(file))

data/lib/dcp/version.rb

@@ -1,3 +1,3 @@
 module DCP
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pit