dcp 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443a8aeede841ab51e1599ad08b8fb4e905de9cebc7b1b66caf135f1ef46864f
-  data.tar.gz: 0c11715af33f809bad76c6c7d0959b14ed56756982a9d7007e13b07dc5ecfe86
+  metadata.gz: 8ae9bca889c34738a0c2ea78783c973b8d325280251def8ecd31c6fad8aaa16e
+  data.tar.gz: ee80f7c7f1eea995da97a767ed200ec40612c05b7d41d64500728cff0faab1b3
 SHA512:
-  metadata.gz: 10afb67747d77d9a1fe3f49daa3c6913e31a80df837ae575264070b0631c1c2d62d9cb377721cfd84402369cb9df08bd074379a8540509c75e0417bc2176254d
-  data.tar.gz: aaa4de559daf52fa455b14b7b8ea33234c6453708867d641d3818206a1e6d1ebd41ac5ba3115257ba4a5cf147eaf9425416a776619b7e86ccd356eaed704b9c0
+  metadata.gz: 9c629121e4db91bf98395c7b22a889c538be69d169194e252714ce6f470871b13c81865d8ff065ebbdc0011605c23fff6cd68be1f312feaf1cb80a5aebbcd632
+  data.tar.gz: ba481ad8eed77700f4701fb5aad056d9ad6d2696904c956d25e2bf43495fac4d1c08014b878a9916581eb84ea3724b8ad4d406e5a26c2e23352c4672b19f927e

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    dcp (0.1.1)
+    dcp (0.2.0)
       dropbox_api
       pit
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
     dropbox_api (0.1.10)
       faraday (~> 0.9, ~> 0.8)
@@ -15,6 +16,7 @@ GEM
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     jwt (1.5.6)
+    method_source (0.9.0)
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -25,6 +27,9 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     pit (0.0.7)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rack (2.0.3)
     rake (10.5.0)
     rspec (3.7.0)
@@ -47,6 +52,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16.a)
   dcp!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/dcp.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16.a"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
 end

data/exe/dcp

@@ -10,38 +10,68 @@ require 'optparse'
 require 'pit'
 
 module DCP
+	class MultiError < StandardError
+		attr_reader :messages
+		def initialize(messages)
+			@messages = messages
+		end
+	end
+
 	class CLI
 		def run
 			opts, args = parse_options
 			dst = args.pop
 			begin
+				precheck(args, dst)
+			rescue MultiError => e
+				e.messages.each{|m| error m}
+				exit 1
+			rescue => e
+				error e.message
+				exit 1
+			end
+			begin
+				dst = dst.chop if dst =~ /\/\z/ # root directory => ''
 				args.each do |src|
 					open(src, 'r') do |r|
-						open(dst, 'w') do |w|
-							w.write(r.read(10_000_000))
+						d = directory?(dst) ? "#{dst}/#{File.basename(src)}" : dst
+						open(d, 'w') do |w|
+							while data = r.read(10_000_000) do
+								w.write(data)
+								print '.' unless opts[:quiet]
+							end
 						end
+						puts unless opts[:quiet]
 					end
 				end
 			rescue => e
-				usage e.message
+				usage "#{e.message} (#{e.class})"
 			end
 		end
 
 	private
+		def error(msg)
+			$stderr.puts "dcp: #{msg}"
+		end
+
 		def parse_options(argv = ARGV)
 			op = OptionParser.new
 
 			self.class.module_eval do
 				define_method(:usage) do |msg = nil|
 					puts op.to_s
-					puts "error: #{msg}" if msg
+					error msg if msg
 					exit 1
 				end
 			end
 
 			opts = {
+				quiet: false
 			}
 
+			op.on('-q', '--quiet', "quiet mode") do
+				opts[:quiet] = true
+			end
 			op.on('-h', '--help', "print this messages") do
 				usage
 			end
@@ -85,14 +115,53 @@ module DCP
 			path =~ /\A(db|dropbox):/
 		end
 
+		def dropbox_path(file)
+			raise StandardError.new("not a dropbox path: #{file}") unless dropbox_path?(file)
+			file.split(/:/, 2)[1]
+		end
+
+		def precheck(srcs, dst)
+			errors = []
+			srcs.each do |src|
+				begin
+					if dropbox_path?(src)
+						errors << "cannot copy from dropbox: #{src}"
+					else
+						if directory?(src)
+							errors << "cannot copy from directory: #{src}"
+						end
+					end
+				rescue Errno::ENOENT
+					errors << "file not found: #{src}"
+				end
+			end
+
+			begin
+				if directory?(dst) && srcs.size > 1
+					errors << "cannot copy multiple files into a file: #{dst}"
+				end
+			rescue Errno::ENOENT
+				errors << "file not found: #{dst}"
+			end
+
+			raise MultiError.new(errors) unless errors.empty?
+		end
+
 		def open(file, opts)
 			if dropbox_path?(file)
-				_, path = file.split(/:/, 2)
-				dropbox.open(path, opts){|f| yield f}
+				dropbox.open(dropbox_path(file), opts){|f| yield f}
 			else
 				File.open(file, opts){|f| yield f}
 			end
 		end
+
+		def directory?(file)
+			if dropbox_path?(file)
+				dropbox.directory?(dropbox_path(file))
+			else
+				File.stat(file).directory?
+			end
+		end
 	end
 end
 

data/lib/dcp/dropbox.rb

@@ -21,5 +21,23 @@ module DCP
 				raise StandardError.new('read from dropbox does not implement.')
 			end
 		end
+
+		def file?(path)
+			return false if path.empty? || path == '/'
+			begin
+				@client.get_metadata(path).class == DropboxApi::Metadata::File
+			rescue ::DropboxApi::Errors::NotFoundError
+				raise Errno::ENOENT.new('file not found on dropbox')
+			end
+		end
+
+		def directory?(path)
+			return true if path.empty? || path == '/'
+			begin
+				@client.get_metadata(path).class == DropboxApi::Metadata::Folder
+			rescue ::DropboxApi::Errors::NotFoundError
+				raise Errno::ENOENT.new('file not found on dropbox')
+			end
+		end
 	end
 end

data/lib/dcp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pit
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: copy files to/from Dropbox like scp command
 email:
 - t@tdtds.jp