docker-sync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663dc1ebdf1337d31366115930e6b1cef1c341e8
-  data.tar.gz: 603862a7b3dcbe9b34c5f1d59fafc9b55173802b
+  metadata.gz: 0b96d12026f794c7f137c039fb0389e8a2bd9f99
+  data.tar.gz: 3fdd3d6be8832db97540a5b36fffe0ba8e92c810
 SHA512:
-  metadata.gz: f9dc34c1f10e8f4c42dfd5e54d84eee04ae913d5ec5c8630f7609762e79b14adf7463ff626f9973e24f29f877a8247709048488768927a9a5ee038958773f887
-  data.tar.gz: b9b3e09576d94707ee2e77ce8b5125c0e76d55f2be3a506f54669860b7714e4495aee005b1d51860f0106c1ed03f6ee9daeb53fdfddfc9d8b0d4813ce2a0e510
+  metadata.gz: f20e0ed261406702dad8118c901157f815832261d811d839fc53f290206ce84132136f6f6c4dc7d58d2b01c0b28c689e76886326e04937b5dba9f17ab1172c7b
+  data.tar.gz: ea92cf7f46e23dd7b396215f6f68bdadfcbf4f6b1169d3a954820fb41ccb73466e1df6d4153704ec98f08a4b2f7f10454eda6fcbbd1f4f430a9882fde3f791da

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/docker-sync/sync_strategy/unison.rb

@@ -135,12 +135,8 @@ module Docker_Sync
 
       # cares about conflict resolution
       def sync_prefer
-        # thats our default, if nothing is set
-        unless @options.key?('sync_prefer') || @options['sync_prefer'] == 'default'
-          return "-prefer '#{@options['src']}' -copyonconflict"
-        end
-
-        case @options['sync_prefer']
+        case @options.fetch('sync_prefer', 'default')
+          when 'default' then "-prefer '#{@options['src']}' -copyonconflict" # thats our default, if nothing is set
           when 'src' then "-prefer #{@options['src']}"
           when 'dest' then "-prefer #{@options['dest']}"
           else "-prefer #{@options['sync_prefer']}"
@@ -171,14 +167,7 @@ module Docker_Sync
           if exists == ''
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
             run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
-            cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' \
-                              -v #{volume_name}:#{@options['dest']} \
-                              -e VOLUME=#{@options['dest']} \
-                              -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} \
-                              #{additional_docker_env} \
-                              #{run_privileged} \
-                              --name #{container_name} \
-                              -d #{@docker_image}"
+            cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e VOLUME=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} #{additional_docker_env} #{run_privileged} --name #{container_name} -d #{@docker_image}"
           else
             say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
             cmd = "docker start #{container_name} && docker exec #{container_name} supervisorctl restart unison"

data/tasks/daemon/daemon.thor

@@ -39,12 +39,12 @@ class Daemon < Thor
     sync.clean
   end
 
-  desc 'log', 'Prints last 100 lines of daemon log. Only for use with docker-sync started in background.'
+  desc 'logs', 'Prints last 100 lines of daemon log. Only for use with docker-sync started in background.'
   method_option :lines, :aliases => '--lines', :default => 100, :type => :numeric, :desc => 'Specify number of lines to tail'
   method_option :follow, :aliases => '-f', :default => false, :type => :boolean, :desc => 'Specify if the logs should be streamed'
-  def log
+  def logs
     opt = options.dup
     sync = Sync.new([], opt)
-    sync.log
+    sync.logs
   end
 end

data/tasks/sync/sync.thor

@@ -12,16 +12,20 @@ class Sync < Thor
   class_option :sync_name, :aliases => '-n',:type => :string, :desc => 'If given, only this sync configuration will be references/started/synced'
   class_option :version, :aliases => '-v',:type => :boolean, :default => false, :desc => 'prints out the version of docker-sync and exits'
 
+  desc '--version, -v', 'Prints out the version of docker-sync and exits'
+  def print_version
+    puts UpgradeChecker.get_current_version
+    exit(0)
+  end
+  map %w[--version -v] => :print_version
+
   desc 'start', 'Start all sync configurations in this project'
   method_option :daemon, :aliases => '-d', :default => false, :type => :boolean, :desc => 'Run in the background'
   method_option :app_name, :aliases => '--name', :default => 'daemon', :type => :string, :desc => 'App name used in PID and OUTPUT file name for Daemon'
   method_option :dir, :aliases => '--dir', :default => './.docker-sync', :type => :string, :desc => 'Path to PID and OUTPUT file Directory'
   method_option :logd, :aliases => '--logd', :default => true, :type => :boolean, :desc => 'To log OUPUT to file on Daemon or not'
   def start
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+    print_version if options[:version]
     # do run update check in the start command only
     UpdateChecker.new().run
     UpgradeChecker.new().run
@@ -46,10 +50,7 @@ class Sync < Thor
   method_option :app_name, :aliases => '--name', :default => 'daemon', :type => :string, :desc => 'App name used in PID and OUTPUT file name for Daemon'
   method_option :dir, :aliases => '--dir', :default => './.docker-sync', :type => :string, :desc => 'Path to PID and OUTPUT file Directory'
   def stop
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+    print_version if options[:version]
 
     config_path = config_preconditions
     sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
@@ -68,10 +69,7 @@ class Sync < Thor
 
   desc 'sync', 'just sync - do not start a watcher though'
   def sync
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+    print_version if options[:version]
 
     config_path = config_preconditions # Preconditions and Define config_path from shared method
 
@@ -81,10 +79,7 @@ class Sync < Thor
 
   desc 'clean', 'Stop and clean up all sync endpoints'
   def clean
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+    print_version if options[:version]
 
     config_path = config_preconditions # Preconditions and Define config_path from shared method
 
@@ -93,7 +88,7 @@ class Sync < Thor
     files = Dir[File.join(dir, '*.pid')]
     files.each do |pid_file|
       pid = File.read(pid_file).to_i
-      Process.kill(:INT, -(Process.getpgid(pid)))
+      Process.kill(:INT, -(Process.getpgid(pid))) if Daemons::Pid.running?(pid)
       say_status 'shutdown', 'Background dsync has been stopped'
     end
     # Remove the .docker-sync directory
@@ -104,14 +99,14 @@ class Sync < Thor
     say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed their volumes', :green
   end
 
-  desc 'log', 'Prints last 100 lines of daemon log. Only for use with docker-sync started in background.'
+  desc 'logs', 'Prints last 100 lines of daemon log. Only for use with docker-sync started in background.'
   method_option :lines, :aliases => '--lines', :default => 100, :type => :numeric, :desc => 'Specify number of lines to tail'
   method_option :follow, :aliases => '-f', :default => false, :type => :boolean, :desc => 'Specify if the logs should be streamed'
-  def log
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+  method_option :dir, :aliases => '--dir', :default => './.docker-sync', :type => :string, :desc => 'Path to PID and OUTPUT file Directory'
+  method_option :logd, :aliases => '--logd', :default => true, :type => :boolean, :desc => 'To log OUPUT to file on Daemon or not'
+  method_option :app_name, :aliases => '--name', :default => 'daemon', :type => :string, :desc => 'App name used in PID and OUTPUT file name for Daemon'
+  def logs
+    print_version if options[:version]
 
     print_daemon_logs
   end
@@ -119,10 +114,7 @@ class Sync < Thor
   desc 'list', 'List all sync-points of the project configuration path'
   method_option :verbose, :default => false, :type => :boolean, :desc => 'Verbose output'
   def list
-    if options[:version]
-      puts UpgradeChecker.get_current_version
-      exit(0)
-    end
+    print_version if options[:version]
 
     config_path = config_preconditions # Preconditions and Define config_path from shared method
 
@@ -197,7 +189,6 @@ class Sync < Thor
 
     def daemon_running?
       pid_file = Daemons::PidFile.find_files(options['dir'], options['app_name']).first || ''
-
       File.file?(pid_file) && Daemons::Pid.running?(File.read(pid_file).to_i)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor