mamiya 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2fb2fdd6a1a46565922f01ce57b1a8e60f0adb2
-  data.tar.gz: 902cdbccfb4320195e837dcb2d3f2f45d9a40c05
+  metadata.gz: a268bd1aef679e677567701786e0bfb1232f9750
+  data.tar.gz: 54a40fd2fa7dfb7b5e2c75d24b6fb05781a9374e
 SHA512:
-  metadata.gz: bc4305e19a32b06dbd9c3bf3c4ce35d231ae85251ab3754f267d8fd33251285fea4cd7b76c4127f3298360860228a7d3c66da6704ce444cc5f97f78a785a85ae
-  data.tar.gz: a83dee125f7bac4f5af2efba42a36675c1fde2193cfaee8fa5d18a3c44518b7be9a3ef5ddee4d978345bb75e5e4aa85ef6bf62da2eb70cb07e9ff34e2aac13c7
+  metadata.gz: 79c8920e28d2ed4a3f3169507fdde0f29ef499039a031a277bde5e527e662644be695f9b0eaa3841ae189e51cfa7fd0907d4601c9d8cc15eacb06ca863ff3c93
+  data.tar.gz: bab3ba643a76b6aefc0c57dea36090e9c3157724df98019b5f9b7bf70152c19c9db7f069f9629521592801a0d51d9907aad6b51117eeb1cc4b86d5b5542f3fc8

data/lib/mamiya.rb

@@ -1,5 +1,12 @@
 require "mamiya/version"
+require 'thread'
 
 module Mamiya
-  # Your code goes here...
+
+  @chdir_monitor = Monitor.new
+  def self.chdir(dir, &block)
+    @chdir_monitor.synchronize do
+      Dir.chdir(dir, &block)
+    end
+  end
 end

data/lib/mamiya/helpers/git.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'mamiya'
 
 set_default :git_remote, 'origin'
 set_default :commit, "#{self.git_remote}/HEAD"
@@ -48,7 +49,7 @@ prepare_build do |update|
     run "git", "clone", self.repository, self.build_from
   end
 
-  Dir.chdir(self.build_from) do
+  Mamiya.chdir(self.build_from) do
     logger.info Dir.pwd
     run "git", "fetch", self.git_remote
     run "git", "remote", "prune", self.git_remote, allow_failure: true
@@ -81,7 +82,7 @@ end
 options[:manage_script] = true unless options.key?(:manage_script)
 options[:script_auto_additionals] = true unless options.key?(:script_auto_additionals)
 if options[:manage_script] && _file
-  Dir.chdir(File.dirname(_file)) do
+  Mamiya.chdir(File.dirname(_file)) do
     break unless git_managed?
 
     script_git_head = git_head()

data/lib/mamiya/package.rb

@@ -1,3 +1,4 @@
+require 'mamiya'
 require 'mamiya/logger'
 
 require 'pathname'
@@ -76,7 +77,7 @@ module Mamiya
       meta['name'] = self.name
       File.write meta_in_build, self.meta.to_json
 
-      Dir.chdir(build_dir) do
+      Mamiya.chdir(build_dir) do
         excludes = exclude_from_package.flat_map { |exclude| ['--exclude', exclude] }
         dereference = dereference_symlinks ? ['-h'] : []
 

data/lib/mamiya/script.rb

@@ -90,7 +90,7 @@ module Mamiya
           l = logger['timekeeper']
           loop do
             if 90 < (Time.now - last_out)
-              l.warn "pid #! {pid} still running; since #{started_at}"
+              l.warn "! pid #{pid} still running; since #{started_at}"
             end
             sleep 60
           end
@@ -135,6 +135,7 @@ module Mamiya
 
     def cd(*args)
       logger.info "$ cd #{args[0]}"
+      # FIXME: This could make conflict with other threads
       Dir.chdir *args
     end
 

data/lib/mamiya/steps/build.rb

@@ -1,3 +1,4 @@
+require 'mamiya'
 require 'mamiya/steps/abstract'
 require 'mamiya/package'
 
@@ -72,15 +73,12 @@ module Mamiya
       end
 
       def run_build
-        old_pwd = Dir.pwd
-        begin
-          # Using without block because chdir in block shows warning
-          Dir.chdir(script.build_from)
+        # FIXME: This could show warning saying "conflicting chdir during another chdir block".
+        # Do not use `Dir.chdir` without block anyware.
+        Mamiya.chdir(script.build_from) do
           logger.info "Running script.build"
           logger.debug "pwd=#{Dir.pwd}"
           script.build[]
-        ensure
-          Dir.chdir old_pwd
         end
       end
 
@@ -112,7 +110,7 @@ module Mamiya
       def set_metadata
         package.meta[:application] = script.application
         package.meta[:script] = File.basename(script_file)
-        Dir.chdir(script.build_from) do
+        Mamiya.chdir(script.build_from) do
           package.meta.replace script.package_meta[package.meta]
         end
       end
@@ -130,7 +128,7 @@ module Mamiya
       def package_name
         @package_name ||= begin
           logger.debug "Determining package name..."
-          name = Dir.chdir(script.build_from) {
+          name = Mamiya.chdir(script.build_from) {
             script.package_name[
               [Time.now.strftime("%Y%m%d%H%M%S"), script.application]
             ].join('-')

data/lib/mamiya/steps/prepare.rb

@@ -1,3 +1,4 @@
+require 'mamiya'
 require 'mamiya/steps/abstract'
 
 require 'pathname'
@@ -8,20 +9,18 @@ module Mamiya
     class Prepare < Abstract
       def run!
         @exception = nil
-        old_pwd = Dir.pwd
-        Dir.chdir(target)
+        Mamiya.chdir(target) do
+          logger.info "Preparing #{target}..."
 
-        logger.info "Preparing #{target}..."
+          script.before_prepare(labels)[]
+          script.prepare(labels)[]
 
-        script.before_prepare(labels)[]
-        script.prepare(labels)[]
-
-        File.write target.join('.mamiya.prepared'), "#{Time.now.to_i}\n"
+          File.write target.join('.mamiya.prepared'), "#{Time.now.to_i}\n"
+        end
       rescue Exception => e
         @exception = e
         raise e
       ensure
-        Dir.chdir old_pwd if old_pwd
         logger.warn "Exception occured, cleaning up..." if @exception
 
         script.after_prepare(labels)[@exception]

data/lib/mamiya/steps/switch.rb

@@ -1,3 +1,4 @@
+require 'mamiya'
 require 'mamiya/steps/abstract'
 
 module Mamiya
@@ -44,14 +45,11 @@ module Mamiya
         # TODO: link with relative if available?
         # TODO: Restore this if FAILED
 
-        old_pwd = Dir.pwd
-        Dir.chdir(target)
+        Mamiya.chdir(target) do
+          logger.info "Releasing..."
 
-        logger.info "Releasing..."
-
-        script.release(labels)[@exception]
-      ensure
-        Dir.chdir old_pwd if old_pwd
+          script.release(labels)[@exception]
+        end
       end
 
       # XXX: dupe with prepare step. modulize?

data/lib/mamiya/storages/s3.rb

@@ -1,6 +1,7 @@
 require 'mamiya/package'
 require 'mamiya/storages/abstract'
 require 'aws-sdk-core'
+require 'fileutils'
 require 'json'
 
 module Mamiya
@@ -64,12 +65,16 @@ module Mamiya
           raise AlreadyFetched
         end
 
-        open(package_path, 'wb+') do |io|
+        tmp_package_path = "#{package_path}.progress"
+        tmp_meta_path = "#{meta_path}.progress"
+        open(tmp_package_path, 'wb+') do |io|
           s3.get_object({bucket: @config[:bucket], key: package_key}, target: io)
         end
-        open(meta_path, 'wb+') do |io|
+        open(tmp_meta_path, 'wb+') do |io|
           s3.get_object({bucket: @config[:bucket], key: meta_key}, target: io)
         end
+        FileUtils.mv(tmp_package_path, package_path)
+        FileUtils.mv(tmp_meta_path, meta_path)
 
         return Mamiya::Package.new(package_path)
 

data/lib/mamiya/storages/s3_proxy.rb

@@ -1,5 +1,6 @@
 require 'mamiya/package'
 require 'mamiya/storages/s3'
+require 'fileutils'
 
 module Mamiya
   module Storages
@@ -22,12 +23,16 @@ module Mamiya
           raise AlreadyFetched
         end
 
-        open(package_path, 'wb+') do |io|
+        tmp_package_path = "#{package_path}.progress"
+        tmp_meta_path = "#{meta_path}.progress"
+        open(tmp_package_path, 'wb+') do |io|
           proxy_get(package_key, io)
         end
-        open(meta_path, 'wb+') do |io|
+        open(tmp_meta_path, 'wb+') do |io|
           proxy_get(meta_key, io)
         end
+        FileUtils.mv(tmp_package_path, package_path)
+        FileUtils.mv(tmp_meta_path, meta_path)
 
         return Mamiya::Package.new(package_path)
 

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/storages/s3_spec.rb

@@ -124,18 +124,18 @@ describe Mamiya::Storages::S3 do
       expect(options[:bucket]).to eq 'testbucket'
       expect(options[:key]).to eq "myapp/test.tar.gz"
       expect(send_options[:target]).to be_a_kind_of(File)
-      expect(send_options[:target].path).to eq tarball
+      expect(send_options[:target].path).to eq("#{tarball}.progress")
 
       options, send_options = requests.shift
       expect(options[:bucket]).to eq 'testbucket'
       expect(options[:key]).to eq "myapp/test.json"
       expect(send_options[:target]).to be_a_kind_of(File)
-      expect(send_options[:target].path).to eq metafile
+      expect(send_options[:target].path).to eq("#{metafile}.progress")
     end
 
     it "returns Mamiya::Package" do
       allow(s3).to receive(:get_object) do
-        File.write metafile, "{}\n"
+        File.write "#{metafile}.progress", "{}\n"
       end
 
       expect(fetch).to be_a_kind_of(Mamiya::Package)
@@ -184,7 +184,7 @@ describe Mamiya::Storages::S3 do
           hash_including(bucket: 'testbucket', key: 'myapp/test.tar.gz'), hash_including(target: an_instance_of(File)))
         expect(s3).to receive(:get_object).with(
           hash_including(bucket: 'testbucket', key: 'myapp/test.json'), hash_including(target: an_instance_of(File))) do
-          File.write metafile, "{}\n"
+          File.write "#{metafile}.progress", "{}\n"
         end
 
         fetch
@@ -199,7 +199,7 @@ describe Mamiya::Storages::S3 do
           hash_including(bucket: 'testbucket', key: 'myapp/test.tar.gz'), hash_including(target: an_instance_of(File)))
         expect(s3).to receive(:get_object).with(
           hash_including(bucket: 'testbucket', key: 'myapp/test.json'), hash_including(target: an_instance_of(File))) do
-          File.write metafile, "{}\n"
+          File.write "#{metafile}.progress", "{}\n"
         end
 
         fetch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor