docker-sync 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22787f972ef84ff342df17b05894ec25b79ec521
-  data.tar.gz: 5d7a83c05ec3194d7292b9f2ab2798bfc9909c76
+  metadata.gz: 53b015ea9a91c28a2a853b611f3f0ffc69897cf3
+  data.tar.gz: 932bbd68a8ea5543626dd4be5e70bdc541efd4c9
 SHA512:
-  metadata.gz: 4a5141387dd95c343f467c9d72bc32038b953e2ec56d5d71ff8e378b667a230333bb8345c5bc049c31c7e6e5d2fa8a9a2c54ea8eef7b1d7eef427adcf1603f12
-  data.tar.gz: 8ddf36c4068404754d969de94d00a70ea56a528f4d127fc600b7d01d656f39b2430e6bc63f30c55a4cba4df85a7555875e6474bb0747e1277f93d7d6009c7f68
+  metadata.gz: abdd92bb2321085d92b156968a9dd2ece9a65a1dfb655baf2a427308b21cda65a67326d15c2b7a805dfd3e351f378825427c0036706866750458eb305b1fb13b
+  data.tar.gz: a8ea319b00c764d183baffe56de3ab2ada13b02df3291d304dd7c0ee1d59415d239e1a4af71d3ff2e351963b4bda44fb53f702b3fd5a9c73fa0fa92873a1fcd4

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/bin/docker-sync

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+$LOAD_PATH.unshift File.expand_path('../../lib', file)
 
 require 'thor'
 require 'docker-sync/update_check'
 
-thor = File.expand_path('../../tasks/sync', __FILE__)
+thor = File.expand_path('../../tasks/sync', file)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile
 }

data/bin/docker-sync-stack

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+$LOAD_PATH.unshift File.expand_path('../../lib', file)
+
 
 require 'thor'
 require 'docker-sync/update_check'
@@ -14,7 +16,7 @@ require 'docker-sync/update_check'
 #  exit 0
 #end
 
-thor = File.expand_path('../../tasks/stack', __FILE__)
+thor = File.expand_path('../../tasks/stack', file)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   # noinspection RubyResolve
   load taskfile

data/lib/docker-sync/compose.rb

@@ -1,20 +1,43 @@
 require 'docker/compose'
-
+require 'pp'
 class ComposeManager
   include Thor::Shell
   @compose_session
   @global_options
   def initialize(global_options)
     @global_options = global_options
-    compose_file_path = 'docker-compose.yml'
+
+    ### production docker-compose.yml
+    compose_files = [File.expand_path('docker-compose.yml')]
     if @global_options.key?('compose-file-path')
       path = File.expand_path(@global_options['compose-file-path'])
       unless File.exist?(path)
         raise("Your referenced docker-compose file in docker-sync.yml was not found at #{@global_options['compose-file-path']}")
       end
-      compose_file_path = @global_options['compose-file-path']
+      compose_files = [path]  # replace
+    end
+
+    ### development docker-compose-dev.yml
+    if @global_options.key?('compose-dev-file-path')
+      # explicit path given
+      path = File.expand_path(@global_options['compose-dev-file-path'])
+      unless File.exist?(path)
+        raise("Your referenced docker-compose-dev file in docker-sync.yml was not found at #{@global_options['compose-dev-file-path']}")
+      end
+      say_status 'ok',"Found explicit docker-compose-dev.yml and using it from #{@global_options['compose-dev-file-path']}", :green
+      compose_files.push path  # add
+    else
+      # try to find docker-compose-dev.yml
+      e = compose_files.to_enum
+      production_compose_file = File.expand_path(e.peek)
+      working_dir = File.dirname(production_compose_file)
+      compose_dev_path = "#{working_dir}/docker-compose-dev.yml"
+      if File.exist?(compose_dev_path)
+        say_status 'ok',"Found implicit docker-compose-dev.yml and using it from #{compose_dev_path}", :green
+        compose_files.push compose_dev_path
+      end
     end
-    @compose_session = Docker::Compose::Session.new(dir:'./', :file => compose_file_path)
+    @compose_session = Docker::Compose::Session.new(dir:'./', :file => compose_files)
   end
 
   def run

data/tasks/stack/stack.thor

@@ -44,17 +44,15 @@ class Stack < Thor
 
     begin
       compose_thread.join
-        #@sync_manager.join_threads
-    rescue SystemExit, Interrupt
-      say_status 'shutdown', 'Shutting down...', :blue
-
-      @sync_manager.stop
-      @compose_manager.stop
-    rescue Exception => e
-
-      puts "EXCEPTION: #{e.inspect}"
-      puts "MESSAGE: #{e.message}"
+      #@sync_manager.join_threads
+      rescue SystemExit, Interrupt
+        say_status 'shutdown', 'Shutting down...', :blue
 
+        @sync_manager.stop
+        @compose_manager.stop
+      rescue Exception => e
+        puts "EXCEPTION: #{e.inspect}"
+        puts "MESSAGE: #{e.message}"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor