docker-sync 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67f02c36cce31164bf4f9afec2a3e69c47cf3bd
-  data.tar.gz: 136018fec5f98c61aab0f4a6041f8e7e3a243546
+  metadata.gz: 7d1a5236f02cd1af95a2c5dd4f958653a2fb3509
+  data.tar.gz: f9eea32e9ed875dcd767bd6c7309c7fe0aa0ea4b
 SHA512:
-  metadata.gz: d3e1b254b1db4b8d217461671a5e071fa8db7a36c14f041f9ed0da65afe273d947eca3bfa027f62f169148bd8a63b3d1895f4fd3d2f95e20a12d416c4b1f5f52
-  data.tar.gz: a2158a9ea86617d859dfb5a35152b38c0bb40327b9c5c3ae5f34a5a9243beab05793a4720e160c9562b03888a317e13760f8cee161fa13d04406e90fe9c38177
+  metadata.gz: ca288151453629511d80e24436ea0efb072cb83ec559787249873b85932814f876e7bd66dad3ad07c288210a0d44612aef58507adbe27eab98afe9c1f5fd2ce1
+  data.tar.gz: 515f0cda8d12222f52c2cd2f63566b8ae5ca8148b76b898fd5e3517fcddbd925743b96d65c4755990b8be3f5ddc09849b1e9bc673d303612014e67192f1a6626

data/Thorfile

@@ -2,6 +2,9 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 thor = File.expand_path('../tasks', __FILE__)
 
+module Global
+  DO_UPDATE_CHECK=false
+end
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile
 }

data/VERSION

@@ -0,0 +1 @@
+0.0.9

data/bin/docker-sync

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
-
-require "thor"
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
+require 'thor'
+require 'update_check'
+DO_UPDATE_CHECK=true
 thor = File.expand_path('../../tasks', __FILE__)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile

data/lib/config.rb

@@ -1,8 +1,31 @@
 require 'pp'
 require 'pathname'
+require 'yaml'
 # this has basically completely reused from Thor::runner.rb - thank you!
 
 module DockerSyncConfig
+  def global_config_location
+    return File.expand_path('~/.docker-sync-global.yml')
+  end
+
+  def global_config
+    global_config_path = global_config_location
+    date = DateTime.new(2001, 1, 1) #paste
+    defaults = {'update_check'=>true, 'update_last_check' => date.iso8601(9), 'update_enforce' => true}
+    if File.exist?(global_config_path)
+      config =  YAML.load_file(global_config_path)
+      config = defaults.merge(config)
+      return config
+    else
+      return defaults
+    end
+  end
+
+  def global_config_save(config)
+    global_config_path = global_config_location
+    File.open(global_config_path, 'w') {|f| f.write config.to_yaml }
+  end
+
   def find_config
     files = find_config_file
     if files.length > 0

data/lib/docker_sync/sync_strategy/rsync.rb

@@ -63,63 +63,82 @@ module Docker_Sync
         return args
       end
 
+      def get_container_name
+        return "#{@sync_name}"
+      end
+
+      def get_volume_name
+        return @sync_name
+      end
+
       # starts a rsync docker container listening on the specific port
       # this container exposes a named volume and is on one side used as the rsync-endpoint for the
       # local rsync command, on the other side the volume is mounted into the app-container to share the code / content
       def start_container
         say_status 'ok', 'Starting rsync', :white
-        running = `docker ps --filter 'status=running' --filter 'name=#{@sync_name}' | grep #{@sync_name}`
+        container_name = get_container_name
+        volume_name = get_volume_name
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | grep #{container_name}`
         if running == '' # container is yet not running
-          say_status 'ok', "#{@sync_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{@sync_name}" | grep #{@sync_name}`
+          say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | grep #{container_name}`
           if exists == '' # container has yet not been created
-            say_status 'ok', "creating #{@sync_name} container", :white if @options['verbose']
-
-            user_mapping = ''
-            if @options.key?('sync_user')
-              user_mapping = "-e OWNER=#{@options['sync_user']}"
-              if @options.key?('sync_userid')
-                user_mapping = "#{user_mapping} -e OWNERID=#{@options['sync_userid']}"
-              end
-            elsif @options.key?('sync_userid')
-              raise("#{@sync_name}: You have set a sync_userid but no sync_user - you need to set both")
-            end
-
-            group_mapping = ''
-            if @options.key?('sync_group')
-              group_mapping = "-e GROUP=#{@options['sync_group']}"
-              if @options.key?('sync_groupid')
-                group_mapping = "#{group_mapping} -e GROUPID=#{@options['sync_groupid']}"
-              end
-            elsif @options.key?('sync_groupid')
-              raise("#{@sync_name}: You have set a sync_groupid but no sync_group - you need to set both")
-            end
-
-            cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{@sync_name}:#{@options['dest']} #{user_mapping} #{group_mapping} -e VOLUME=#{@options['dest']} --name #{@sync_name} -d eugenmayer/rsync"
+            say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
+
+            user_mapping = get_user_mapping
+            group_mapping = get_group_mapping
+
+            cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{volume_name}:#{@options['dest']} #{user_mapping} #{group_mapping} -e VOLUME=#{@options['dest']} --name #{container_name} -d eugenmayer/rsync"
           else # container already created, just start / reuse it
-            say_status 'ok', "starting #{@sync_name} container", :white if @options['verbose']
-            cmd = "docker start #{@sync_name}"
+            say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
+            cmd = "docker start #{container_name}"
           end
           say_status 'command', cmd, :white if @options['verbose']
           `#{cmd}` || raise('Start failed')
         else
-          say_status 'ok', "#{@sync_name} container still running", :blue if @options['verbose']
+          say_status 'ok', "#{container_name} container still running", :blue if @options['verbose']
         end
-        say_status 'ok', "starting initial #{@sync_name} of src", :white if @options['verbose']
+        say_status 'ok', "#{container_name}: starting initial sync of #{@options['src']}", :white if @options['verbose']
         # this sleep is needed since the container could be not started
         sleep 1
         sync
         say_status 'success', 'Rsync server started', :green
       end
 
+      def get_user_mapping
+        user_mapping = ''
+        if @options.key?('sync_user')
+          user_mapping = "-e OWNER=#{@options['sync_user']}"
+          if @options.key?('sync_userid')
+            user_mapping = "#{user_mapping} -e OWNERID=#{@options['sync_userid']}"
+          end
+        elsif @options.key?('sync_userid')
+          raise("#{get_container_name}: You have set a sync_userid but no sync_user - you need to set both")
+        end
+        return user_mapping
+      end
+
+      def get_group_mapping
+        group_mapping = ''
+        if @options.key?('sync_group')
+          group_mapping = "-e GROUP=#{@options['sync_group']}"
+          if @options.key?('sync_groupid')
+            group_mapping = "#{group_mapping} -e GROUPID=#{@options['sync_groupid']}"
+          end
+        elsif @options.key?('sync_groupid')
+          raise("#{get_container_name}: You have set a sync_groupid but no sync_group - you need to set both")
+        end
+        return group_mapping
+      end
+
       def stop_container
-        `docker stop #{@sync_name}`
+        `docker stop #{get_container_name}`
       end
 
       def reset_container
         stop_container
-        `docker rm #{@sync_name}`
-        `docker volume rm #{@sync_name}`
+        `docker rm #{get_container_name}`
+        `docker volume rm #{get_volume_name}`
       end
 
       def clean
@@ -127,11 +146,11 @@ module Docker_Sync
       end
 
       def stop
-        say_status 'ok', "Stopping sync container #{@sync_name}"
+        say_status 'ok', "Stopping sync container #{get_container_name}"
         begin
           stop_container
         rescue Exception => e
-          say_status 'error', "Stopping failed of #{@sync_name}:", :red
+          say_status 'error', "Stopping failed of #{get_container_name}:", :red
           puts e.message
         end
       end

data/lib/docker_sync/sync_strategy/unison.rb

@@ -39,14 +39,14 @@ module Docker_Sync
 
         say_status 'command', cmd, :white if @options['verbose']
 
-        Open3.popen3(cmd)
-        if $?.exitstatus > 0
+        stdout, stderr, exit_status = Open3.capture3(cmd)
+        if not exit_status.success?
           say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
-          say_status 'message', out
+          say_status 'message', stderr
         else
           say_status 'ok', "Synced #{@options['src']}", :white
           if @options['verbose']
-            say_status 'output', out
+            say_status 'output', stdout
           end
         end
       end
@@ -64,6 +64,7 @@ module Docker_Sync
         args.push('-batch')
         args.push(@options['sync_args']) if @options.key?('sync_args')
         args.push("socket://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/")
+        args.push('-debug verbose') if @options['verbose']
         if @options.key?('sync_user') || @options.key?('sync_group') || @options.key?('sync_groupid') || @options.key?('sync_userid')
           raise('Unison does not support sync_user, sync_group, sync_groupid or sync_userid - please use rsync if you need that')
         end
@@ -72,37 +73,48 @@ module Docker_Sync
 
       def start_container
         say_status 'ok', 'Starting unison', :white
-        running = `docker ps --filter 'status=running' --filter 'name=#{@sync_name}' | grep #{@sync_name}`
+        container_name = get_container_name
+        volume_name = get_volume_name
+
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | grep #{container_name}`
         if running == ''
-          say_status 'ok', "#{@sync_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{@sync_name}" | grep #{@sync_name}`
+          say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | grep #{container_name}`
           if exists == ''
-            say_status 'ok', "creating #{@sync_name} container", :white if @options['verbose']
-            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{@sync_name}:#{@options['dest']} -e UNISON_VERSION=#{UNISON_VERSION} -e UNISON_WORKING_DIR=#{@options['dest']} --name #{@sync_name} -d #{UNISON_IMAGE}"
+            say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
+            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e UNISON_VERSION=#{UNISON_VERSION} -e UNISON_WORKING_DIR=#{@options['dest']} --name #{container_name} -d #{UNISON_IMAGE}"
           else
-            say_status 'ok', "starting #{@sync_name} container", :ok if @options['verbose']
-            cmd = "docker start #{@sync_name}"
+            say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
+            cmd = "docker start #{container_name}"
           end
           say_status 'command', cmd, :white if @options['verbose']
           `#{cmd}` || raise('Start failed')
         else
-          say_status 'ok', "#{@sync_name} container still running", :blue
+          say_status 'ok', "#{container_name} container still running", :blue
         end
-        say_status 'ok', "starting initial #{@sync_name} of src", :white if @options['verbose']
+        say_status 'ok', "starting initial #{container_name} of src", :white if @options['verbose']
         # this sleep is needed since the container could be not started
         sleep 1
         sync
         say_status 'success', 'Unison server started', :green
       end
 
+      def get_container_name
+        return "#{@sync_name}"
+      end
+
+      def get_volume_name
+        return @sync_name
+      end
+
       def stop_container
-        `docker stop #{@sync_name}`
+        `docker stop #{get_container_name}`
       end
 
       def reset_container
         stop_container
-        `docker rm #{@sync_name}`
-        `docker volume rm #{@sync_name}`
+        `docker rm #{get_container_name}`
+        `docker volume rm #{get_volume_name}`
       end
 
       def clean
@@ -110,11 +122,11 @@ module Docker_Sync
       end
 
       def stop
-        say_status 'ok', "Stopping sync container #{@sync_name}"
+        say_status 'ok', "Stopping sync container #{get_container_name}"
         begin
           stop_container
         rescue Exception => e
-          say_status 'error', "Stopping failed of #{@sync_name}:", :red
+          say_status 'error', "Stopping failed of #{get_container_name}:", :red
           puts e.message
         end
       end

data/lib/update_check.rb

@@ -0,0 +1,63 @@
+require 'gem_update_checker'
+require 'thor/actions'
+require 'config'
+
+class UpdateChecker
+  include Thor::Shell
+  include DockerSyncConfig
+  @config
+  def initialize
+    @config = global_config
+  end
+
+  def run
+    unless @config['update_check']
+      say_status 'hint','Skipping up-to-date check since it has been disabled in yout ~/.docker-sync-global.yml configuration',:yellow
+      return
+    end
+    unless should_run
+      return
+    end
+    check_and_warn(@config['update_enforce'])
+  end
+
+  def should_run
+    now = DateTime.now
+    last_check = DateTime.iso8601(@config['update_last_check'])
+    check_after_days = 2
+    if now - last_check > check_after_days
+      return true
+    end
+
+    return false
+  end
+
+  def get_current_version
+    path = File.expand_path('../../', __FILE__)
+    return File.read("#{path}/VERSION")
+  end
+
+  def docker_sync_update_check
+    gem_name = 'docker-sync'
+    current_version = get_current_version
+    checker = GemUpdateChecker::Client.new(gem_name, current_version)
+    return checker
+  end
+
+  def check_and_warn(update_enforced = true)
+    # update the timestamp
+    now = DateTime.now
+    @config['update_last_check'] = now.iso8601(9)
+    global_config_save(@config)
+
+    check = docker_sync_update_check
+    if check.update_available
+      say_status 'warning',"There is an update (#{check.latest_version}) available (current version #{check.current_version}). Please update before you continue",:yellow
+      if yes?("Shall i update docker-sync to #{check.latest_version} for you?")
+        system('gem update docker-sync')
+      else
+        exit 1 if update_enforced
+      end
+    end
+  end
+end

data/tasks/sync.thor

@@ -1,6 +1,7 @@
 require 'docker_sync/sync_manager'
 require 'config'
 require 'preconditions'
+require 'update_check'
 
 class Sync < Thor
   include DockerSyncConfig
@@ -11,6 +12,10 @@ class Sync < Thor
 
   desc 'start', 'Start all sync configurations in this project'
   def start
+    # do run update check in the start command only
+    updates = UpdateChecker.new
+    updates.run
+
     begin
       check_all_preconditions
     rescue Exception => e
@@ -82,6 +87,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
+    pp Gem.configuration
     begin
       check_all_preconditions
     rescue Exception => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem_update_checker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sync your code live to docker-containers without losing any performance
   on OSX
 email: eugen.mayer@kontextwork.de
@@ -33,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Thorfile
+- VERSION
 - bin/docker-sync
 - lib/config.rb
 - lib/docker_sync/sync_manager.rb
@@ -42,6 +57,7 @@ files:
 - lib/docker_sync/watch_strategy/fswatch.rb
 - lib/execution.rb
 - lib/preconditions.rb
+- lib/update_check.rb
 - tasks/sync.thor
 homepage: https://github.com/EugenMayer/docker_sync
 licenses: