tumugi-plugin-google_drive 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813453c81708108b539ff741428030f1d4c431b0
-  data.tar.gz: eab95dcf2f132a73ce6af6318a74df13f4d3afc1
+  metadata.gz: 6299d3432c8ea64f32980e96034eedd84ba7ccd9
+  data.tar.gz: 24be0abafa651a00fb408bb5efcd791ddedc4028
 SHA512:
-  metadata.gz: d1e9252df8992ed4ec76150d8a3e1a6c3bf4ba59ca0bca17579daa2bab84e61b9e5bd81fa01e22455318f07b8b830710f1434f95c1c70be578ad5f60a7273fe6
-  data.tar.gz: ce205a1b015a4852280cde6feb9600f9e11383c8340e7d70da12740afcc54e4a832efee61942fa0936e0f54bd40bbf638d4ea5680240fa8894adc7e147d960c3
+  metadata.gz: 4efc5aa4b66a9c81fb01b200290dacb44165e8a2b4390881678f10c8263b846de3733f82af1171cc39420c7a517cd3edfdd69c17ea3eb995784131176cdb517a
+  data.tar.gz: 02d61db00ff93d161899a39f5e53bf99fcc85561289b6e538976aa73d4b16f1ba8bedb68a81bd3c7a79723b1310fb9269fc41d96a9391dcf967f3cdf5e5c0eeb

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Change Log
 
-## [v0.2.0](https://github.com/tumugi/tumugi-plugin-google_drive/tree/v0.2.0) (2016-07-19)
+## [v0.3.0](https://github.com/tumugi/tumugi-plugin-google_drive/tree/v0.3.0) (2016-08-02)
+[Full Changelog](https://github.com/tumugi/tumugi-plugin-google_drive/compare/v0.2.0...v0.3.0)
+
+**Implemented enhancements:**
+
+- \[Breaking Change\] Support match by name [\#12](https://github.com/tumugi/tumugi-plugin-google_drive/pull/12) ([hakobera](https://github.com/hakobera))
+
+## [v0.2.0](https://github.com/tumugi/tumugi-plugin-google_drive/tree/v0.2.0) (2016-07-18)
 [Full Changelog](https://github.com/tumugi/tumugi-plugin-google_drive/compare/v0.1.0...v0.2.0)
 
 **Merged pull requests:**
 
+- Prepare release for 0.2.0 [\#11](https://github.com/tumugi/tumugi-plugin-google_drive/pull/11) ([hakobera](https://github.com/hakobera))
 - Update README [\#10](https://github.com/tumugi/tumugi-plugin-google_drive/pull/10) ([hakobera](https://github.com/hakobera))
 - Update tumugi to 0.6 [\#9](https://github.com/tumugi/tumugi-plugin-google_drive/pull/9) ([hakobera](https://github.com/hakobera))
 

data/examples/example.rb

@@ -1,19 +1,22 @@
 task :task1 do
   param :day, type: :time, auto_bind: true, required: true
+  param :seed, type: :string, auto_bind: true, required: true
+
   requires :folder
 
   output do
     target(:google_drive_file,
-          name: "test_#{day.strftime('%Y%m%d')}.txt",
+          name: "test_#{day.strftime('%Y%m%d%H%M')}_#{seed}.txt",
           parents: input.folder_id)
   end
 
   run do
-    log 'task1#run'
-    output.open('w') {|f| f.puts('done') }
+    log "task1#run"
+    output.open("w") {|f| f.puts("done") }
   end
 end
 
 task :folder, type: :google_drive_folder do
-  name 'xyz'
+  param :day, type: :time, auto_bind: true, required: true
+  name { "folder_#{day.strftime('%Y%m%d%H%M')}" }
 end

data/lib/tumugi/plugin/google_drive/file_system.rb

@@ -113,6 +113,14 @@ module Tumugi
           process_error($!)
         end
 
+        def list_files(query:, order_by: "name", spaces: "drive", fields: "next_page_token, files(id, name, parents, mime_type)", page_size: 100, page_token: nil)
+          # https://developers.google.com/drive/v3/reference/files/list
+          # https://developers.google.com/drive/v3/web/search-parameters
+          client.list_files(q: query, order_by: order_by, spaces: spaces, fields: fields, page_size: page_size, page_token: page_token)
+        rescue
+          process_error($!)
+        end
+
         private
 
         def save_config(config)

data/lib/tumugi/plugin/target/google_drive_file.rb

@@ -11,12 +11,12 @@ module Tumugi
 
       attr_reader :file_id, :name, :parents
 
-      def initialize(file_id: nil, name: nil, parents: nil, fs: nil)
+      def initialize(file_id: nil, name:, parents: nil, fs: nil)
         @fs = fs unless fs.nil?
-        @file_id = file_id || self.fs.generate_file_id
+        @file_id = file_id
         @name = name
         @parents = parents
-        super(@file_id)
+        super(file_id)
       end
 
       def fs
@@ -25,18 +25,26 @@ module Tumugi
 
       def open(mode="r", &block)
         if mode.include? 'r'
+          if file_id.nil?
+            file = find_by_name(name)
+            @file_id = file.id unless file.nil?
+          end
           fs.download(file_id, mode: mode, &block)
         elsif mode.include? 'w'
-          file = Tumugi::Plugin::GoogleDrive::AtomicFile.new(name, fs, file_id: @file_id, parents: @parents)
+          file = Tumugi::Plugin::GoogleDrive::AtomicFile.new(name, fs, file_id: file_id, parents: @parents)
           file.open(&block)
           @file_id = file.id
         else
-          raise Tumugi::TumugiError.new('Invalid mode: #{mode}')
+          raise Tumugi::TumugiError.new("Invalid mode: #{mode}")
         end
       end
 
       def exist?
-        fs.exist?(file_id)
+        if file_id
+          fs.exist?(file_id)
+        else
+          !!find_by_name(name)
+        end
       end
 
       def to_s
@@ -44,6 +52,29 @@ module Tumugi
         s += ", parents: #{parents}" if parents
         s
       end
+
+      private
+
+      def find_by_name(n)
+        query =  "name='#{n}'"
+        ps = parents
+        if parents.is_a?(String)
+          ps = [parents]
+        end
+        if parents
+          query += " and ("
+          query += "#{ps.map{|p| "'#{p}' in parents"}.join(" or ")}"
+          query += ")"
+        end
+        files = fs.list_files(query: query, page_size: 2).files
+        if files.size == 0
+          nil
+        elsif files.size == 1
+          files.first
+        else
+          raise Tumugi::TumugiError.new("Multiple files find for query: #{query}")
+        end
+      end
     end
   end
 end

data/lib/tumugi/plugin/target/google_drive_folder.rb

@@ -9,9 +9,9 @@ module Tumugi
 
       attr_reader :folder_id, :name, :parents
 
-      def initialize(folder_id: nil, name: nil, parents: nil, fs: nil)
+      def initialize(folder_id: nil, name:, parents: nil, fs: nil)
         @fs = fs unless fs.nil?
-        @folder_id = folder_id || self.fs.generate_file_id
+        @folder_id = folder_id
         @name = name
         @parents = parents
       end
@@ -21,7 +21,17 @@ module Tumugi
       end
 
       def exist?
-        fs.exist?(folder_id)
+        if folder_id
+          fs.exist?(folder_id)
+        else
+          !!find_by_name(name)
+        end
+      end
+
+      def mkdir
+        fid = folder_id || fs.generate_file_id
+        fs.mkdir(name, folder_id: fid, parents: parents)
+        @folder_id = fid
       end
 
       def to_s
@@ -29,6 +39,29 @@ module Tumugi
         s += ", parents: #{parents}" if parents
         s
       end
+
+      private
+
+      def find_by_name(n)
+        query =  "name='#{n}'"
+        ps = parents
+        if parents.is_a?(String)
+          ps = [parents]
+        end
+        if parents
+          query += " and ("
+          query += "#{ps.map{|p| "'#{p}' in parents"}.join(" or ")}"
+          query += ") and mime_type = '#{Tumugi::Plugin::GoogleDrive::FileSystem::MIME_TYPE_FOLDER}'"
+        end
+        files = fs.list_files(query: query, page_size: 2).files
+        if files.size == 0
+          nil
+        elsif files.size == 1
+          files.first
+        else
+          raise Tumugi::TumugiError.new("Multiple files find for query: #{query}")
+        end
+      end
     end
   end
 end

data/lib/tumugi/plugin/task/google_drive_folder.rb

@@ -19,7 +19,7 @@ module Tumugi
           log "skip: #{output} is already exists"
         else
           log "create folder: #{output}"
-          output.fs.mkdir(name, folder_id: output.folder_id, parents: output.parents)
+          output.mkdir
         end
       end
     end

data/tumugi-plugin-google_drive.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "tumugi-plugin-google_drive"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Kazuyuki Honda"]
   spec.email         = ["hakobera@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tumugi-plugin-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kazuyuki Honda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumugi