radikocopy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7403095016e0db5737b4c43b33d3ea8d54743101
-  data.tar.gz: bf8beaa481ba9b01bdae5de5901a07c1545fe3ec
+  metadata.gz: 1533e1092a18c3b600f09c5ee71740744f3364fe
+  data.tar.gz: a88eeccc97050581629a8596589640fbe9369d9f
 SHA512:
-  metadata.gz: 55da42d6939ed1986c4baf1509b7ed23d96ab3e8b7093134e6ed1c9c6c65552b7fc93aa71ba0d121782012c3b4ff1e32effbdaedf6a2982df771049d423017e4
-  data.tar.gz: d761c1c8df7dec9187a1affc988609366321d1b0658333d24fd77748ec99924d9f5dd7f7192b862ad07433a982cdeec4c505dd714a41721a728990da43ed5614
+  metadata.gz: 19620e88d9adea91b6e7d4aa4287a75be2396b101414d8646a5710c8cff42e7be589524f96d8f8d43eccb493d819479f0ca9b6491f407a177a22cb5b11de5c28
+  data.tar.gz: 43a7c14b14518a14dc678d6f36a766b4e09d1be6f3ed24d166b7f792f09b72eccd6f408645f9b42a390cd694c0ec2810d4dc802620c345c430d4ff23ec5b2954

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/build.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# rmagick for sierra
+#export PKG_CONFIG_PATH=/usr/local/opt/imagemagick@6/lib/pkgconfig
+#export PATH=/usr/local/Cellar/imagemagick@6/6.9.7-5/bin:$PATH
+
+bundle_dir=./vendor/bundle
+if [ -d "$bundle_dir" ] ; then
+    /bin/rm -rf "$bundle_dir"
+    bundle update    
+else
+    /bin/rm -rf "$bundle_dir"
+    bundle install --path "$bundle_dir"
+fi
+
+
+
+
+

data/lib/radikocopy/version.rb

@@ -1,3 +1,3 @@
 module Radikocopy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/radikocopy.rb

@@ -47,6 +47,7 @@ module Radikocopy
       opts = {}
       opt = OptionParser.new(argv)
       opt.banner = "Usage: #{opt.program_name} [-h|--help] [config.yml]"
+      opt.version = Radikocopy::VERSION
       opt.separator('')
       opt.separator "Options:"
       opt.on_head('-h', '--help', 'Show this message') do |v|
@@ -112,28 +113,52 @@ module Radikocopy
       basename = File.basename(filename)
       local_file = File.join(@config.local_dir, basename)
       if FileTest.file?(local_file)
-        puts "exists local_file #{local_file}"
+# TODO -v option        
+#        puts "exists local_file #{local_file}"
         return false
       end
       copy_command = "scp #{@config.remote_host}:\"'#{filename}'\" \"#{@config.local_dir}\""
-      runcmd(copy_command)
+      runcmd_and_exit(copy_command)
       true
     end
 
     def import_files(files)
       files.each do |file|
-        cmd = "osascript #{@config.import_scpt} \"#{file}\""
-        runcmd(cmd)
+        import_ok = false
+        3.times do |i|
+          if import_file(file, i)
+            import_ok = true
+            break
+          end
+          sleep(1)
+        end
+        unless import_ok
+          puts "import failed"
+          File.unlink(file)
+        end
       end
     end
 
-    def runcmd(cmd)
-      puts cmd
-      unless system(cmd)
+    def import_file(file, i)
+      cmd = "osascript #{@config.import_scpt} \"#{file}\""
+      unless runcmd(cmd)
+        puts "import error[#{i}] #{file}"
+        return false
+      end
+      true
+    end
+
+    def runcmd_and_exit(cmd)
+      unless runcmd(cmd)
         puts "system error"
-        exit(1)
+        exit(1)        
       end
     end
+
+    def runcmd(cmd)
+      puts cmd
+      system(cmd)
+    end    
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radikocopy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -69,6 +70,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- build.sh
 - config/radikocopyrc
 - exe/radikocopy
 - lib/radikocopy.rb
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Radiko copy tool