metric_tools 0.0.2 → 0.0.3

data/README.md

@@ -25,10 +25,10 @@
 ### S3
     
     S3.login('Access_Key', 'secret_key~~', 'bucket-name!')
-    S3.fetch_all('logs/retention_rate', 'User/masaori/Desktop/') #fetch all files in specified s3 directory
+    S3.fetch_all('logs/retention_rate', '/User/masaori/Desktop/') #fetch all files in specified s3 directory
     
     # You can give a condition.
-    S3.fetch_all('logs/retention_rate, 'User/masaori/Desktop/') {|f| f.name.include? ".rb" } #Download all ".rb" files
+    S3.fetch_all('logs/retention_rate, '/User/masaori/Desktop/') {|f| f.name.include? ".rb" } #Download all ".rb" files
     
 ### Skype
     

data/lib/metric_tools/s3.rb

@@ -19,6 +19,8 @@ module MetricTools
         @secret      = secret
         @bucket_name = bucket_name
 
+        puts "Login to #{bucket_name} .."
+
         AWS::S3::Base.establish_connection!(
           :access_key_id     => key,
           :secret_access_key => secret,
@@ -56,18 +58,22 @@ module MetricTools
       # force_all=falseにすると、既にローカルにファイルが有る場合はDLしません。
       #
       def fetch_all(dir_key, target_dir, force_all=false, &condition)
-        remote_files = @bucket
+        objects_in_dir = @bucket.objects(prefix: dir_key)
+        remote_files = objects_in_dir
                         .select{|obj|
+                          puts obj.key
                           key = obj.key
                           is_dir = (key[key.length-1] == '/')
-                          name = key.include? dir_key
                           cond = condition.nil? ? true : condition.call(obj)
-                          !is_dir && name && cond }
+                          !is_dir && cond }
                         .collect{|obj| obj.key }
-        local_files = Dir.glob(File.join(target_dir, "**/*"))
+        Dir.chdir(target_dir)
+        local_files = Dir["**/*"]
+
+        puts "remote directory is empty => #{@bucket.name}/#{dir_key}" if @remote_files.empty?
 
         remote_files.each {|key|
-          if force_all || !local_files.include?(File.basename(key))
+          if force_all || !local_files.any?{|f| File.basename(f) == File.basename(key)}
             download(key, target_dir, true)
           end
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metric_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: