docker-sync 0.2.3 → 0.3.0

data/lib/docker-sync/preconditions/strategy.rb

@@ -0,0 +1,57 @@
+require 'docker-sync/preconditions/preconditions_osx'
+require 'docker-sync/preconditions/preconditions_linux'
+
+require 'singleton'
+require 'os'
+
+module DockerSync
+  module Preconditions
+    class Strategy
+      include Singleton
+
+      attr_accessor :strategy
+
+      def initialize
+        if DockerSync::Preconditions::Strategy.is_osx
+          @strategy = DockerSync::Preconditions::Osx.new
+        elsif DockerSync::Preconditions::Strategy.is_linux
+          @strategy = DockerSync::Preconditions::Linux.new
+        end
+      end
+
+      def self.is_osx
+        return OS.mac?
+      end
+
+      def self.is_linux
+        return OS.linux?
+      end
+
+      def check_all_preconditions(config)
+        strategy.check_all_preconditions(config)
+      end
+
+      def docker_available
+        strategy.docker_available
+      end
+
+      def docker_running
+        strategy.docker_running
+      end
+
+      def rsync_available
+        strategy.rsync_available
+      end
+
+
+      def fswatch_available
+        strategy.fswatch_available
+      end
+
+      def unison_available
+        strategy.unison_available
+      end
+    end
+  end
+end
+

data/lib/docker-sync/sync_manager.rb

@@ -3,10 +3,6 @@ require 'thor/shell'
 require 'docker-sync/sync_process'
 # noinspection RubyResolve
 require 'docker-sync/execution'
-require 'yaml'
-require 'dotenv'
-require 'docker-sync/config_template'
-require 'docker-sync/config'
 
 module Docker_sync
   class SyncManager
@@ -17,31 +13,9 @@ module Docker_sync
     @config_path
 
     def initialize(options)
-      DockerSyncConfig.load_dotenv
-
       @sync_processes = []
-      @config_syncs = []
-      @config_global = []
-      @config_string = options[:config_string]
-      @config_path = options[:config_path]
-      load_configuration
-    end
 
-    def load_configuration_file
-      unless File.exist?(@config_path)
-        raise "Config could not be loaded from #{@config_path} - it does not exist"
-      end
-      return File.read(@config_path)
-    end
-    
-    def load_configuration
-      # try to interpolate supplied inline config string, alternatively load the configuration file
-      config = ConfigTemplate::interpolate_config_string(@config_string || load_configuration_file())
-
-      validate_config(config)
-      @config_global = config['options'] || {}
-      @config_syncs = config['syncs']
-      upgrade_syncs_config
+      load_configuration(options)
     end
 
     def global_options
@@ -87,26 +61,6 @@ module Docker_sync
       end
     end
 
-    def validate_config(config)
-      unless config.key?('syncs')
-        raise ('no syncs defined')
-      end
-
-      config['syncs'].each do |name, sync_config|
-        validate_sync_config(name, sync_config)
-      end
-
-      return true
-    end
-
-    def validate_sync_config(name, sync_config)
-      config_mandatory = %w[src]
-      config_mandatory.push('sync_host_port') if sync_config['sync_strategy'] == 'rsync' #TODO: Implement autodisovery for other strategies
-      config_mandatory.each do |key|
-        raise ("#{name} does not have #{key} configuration value set - this is mandatory") unless sync_config.key?(key)
-      end
-    end
-
     def init_sync_processes(sync_name = nil)
       return if @sync_processes.size != 0
       if sync_name.nil?
@@ -199,5 +153,20 @@ module Docker_sync
         sync_process.watch
       }
     end
+
+    private
+
+      def load_configuration(options)
+        config = options[:config] ||
+          DockerSync::ProjectConfig.new(
+            config_path: options[:config_path],
+            config_string: options[:config_string]
+          )
+
+        @config_global = config['options'] || {}
+        @config_syncs = config['syncs']
+        upgrade_syncs_config
+      end
+
   end
 end

data/lib/docker-sync/sync_process.rb

@@ -31,34 +31,26 @@ module Docker_Sync
     end
 
     def set_sync_strategy
-      if @options.key?('sync_strategy')
-        case @options['sync_strategy']
-          when 'rsync'
-            @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
-          else
-            @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
-        end
-      else
+      case @options['sync_strategy']
+      when 'rsync'
+        @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
+      when 'unison'
         @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+      else
+        raise "Unknown sync_strategy #{@options['sync_strategy']}"
       end
     end
 
     def set_watch_strategy
-      if @options.key?('watch_strategy')
-        case @options['watch_strategy']
-          when 'fswatch'
-            @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
-          when 'disable','dummy'
-            @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
-          else
-            @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
-        end
+      case @options['watch_strategy']
+      when 'fswatch'
+        @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
+      when 'dummy'
+        @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
+      when 'unison'
+        @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
       else
-        if @options['sync_strategy'] == 'rsync'
-          @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
-        else
-          @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
-        end
+        raise "Unknown watch_strategy #{@options['watch_strategy']}"
       end
     end
 

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

@@ -1,5 +1,5 @@
 require 'thor/shell'
-require 'docker-sync/preconditions'
+require 'docker-sync/preconditions/strategy'
 require 'terminal-notifier'
 
 module Docker_Sync
@@ -22,9 +22,9 @@ module Docker_Sync
         end
 
         begin
-          Preconditions::rsync_available
+          DockerSync::Preconditions::Strategy.instance.rsync_available
         rescue Exception => e
-          say_status 'error', "#{@sync_name} has been configured to sync with rsync, but no rsync binary available", :red
+          say_status 'error', "#{@sync_name} has been configured to sync with rsync, but no rsync or fswatch binary available", :red
           say_status 'error', e.message, :red
           exit 1
         end

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

@@ -1,5 +1,5 @@
 require 'thor/shell'
-require 'docker-sync/preconditions'
+require 'docker-sync/preconditions/strategy'
 require 'docker-sync/execution'
 require 'open3'
 require 'socket'
@@ -26,9 +26,7 @@ module Docker_Sync
           @docker_image = 'eugenmayer/unison'
         end
         begin
-          Preconditions::unison_available
-          Preconditions::unox_available
-          Preconditions::macfsevents_available
+          DockerSync::Preconditions::Strategy.instance.unison_available
         rescue Exception => e
           say_status 'error', "#{@sync_name} has been configured to sync with unison, but no unison available", :red
           say_status 'error', e.message, :red
@@ -217,7 +215,7 @@ module Docker_Sync
       end
 
       def stop_container
-        `docker ps | grep #{get_container_name} && docker stop #{get_container_name}`
+        `docker ps | grep #{get_container_name} && docker stop #{get_container_name} && docker wait #{get_container_name}`
       end
 
       def reset_container

data/lib/docker-sync/update_check.rb

@@ -1,6 +1,6 @@
 require 'gem_update_checker'
 require 'thor/actions'
-require 'docker-sync/config'
+require 'docker-sync/config/global_config'
 
 class UpdateChecker
   include Thor::Shell
@@ -8,7 +8,7 @@ class UpdateChecker
   @newer_image_found
 
   def initialize
-    @config = DockerSyncConfig::global_config
+    @config = DockerSync::GlobalConfig.load
     @newer_image_found = false
   end
 
@@ -22,22 +22,28 @@ class UpdateChecker
     end
 
     # do not check the image if its the first run - since this it will be downloaded anyway
-    unless DockerSyncConfig::is_first_run
-      check_rsync_image
-      check_unison_image
-
-      # stop if there was an update
-      if @newer_image_found
-        say_status 'warning', 'One or more images have been updated. Please use "docker-sync clean" before you start docker-sync again', :red
-        exit 0
+    unless @config.first_run?
+      unless has_internet?
+        check_unison_image
+        check_rsync_image
+        # stop if there was an update
+        if @newer_image_found
+          say_status 'warning', 'One or more images have been updated. Please use "docker-sync clean" before you start docker-sync again', :red
+          exit 0
+        end
       end
-
     end
 
     check_and_warn(@config['update_enforce'])
   end
 
+  def has_internet?
+    `ping -c1 -t 1 8.8.8.8 &2>1 /dev/null`
+    return $?.success?
+  end
+
   def should_run
+    return false unless has_internet?
     now = DateTime.now
     last_check = DateTime.iso8601(@config['update_last_check'])
     check_after_days = 2
@@ -86,10 +92,7 @@ class UpdateChecker
 
   def check_and_warn(update_enforced = true)
     # update the timestamp
-    now = DateTime.now
-    @config['update_last_check'] = now.iso8601(9)
-
-    DockerSyncConfig::global_config_save(@config)
+    @config.update! 'update_last_check' => DateTime.now.iso8601(9)
 
     check = docker_sync_update_check
     if check.update_available

data/lib/docker-sync/upgrade_check.rb

@@ -1,12 +1,12 @@
 require 'gem_update_checker'
 require 'thor/actions'
-require 'docker-sync/config'
+require 'docker-sync/config/global_config'
 
 class UpgradeChecker
   include Thor::Shell
   @config
   def initialize
-    @config = DockerSyncConfig::global_config
+    @config = DockerSync::GlobalConfig.load
   end
 
   def run
@@ -17,13 +17,18 @@ class UpgradeChecker
   end
 
   def last_upgraded_version
-    @config['upgrade_status'] || ''
+    @config['upgrade_status']
   end
 
   def should_run
     # get the update_status which is the version of the update hook which has been run already
     upgrade_status = last_upgraded_version
-    if upgrade_status == '' || Gem::Version.new(upgrade_status) < Gem::Version.new(UpgradeChecker.get_current_version) # thats how we compare the version
+    if upgrade_status == ''
+      @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
+      return
+    end
+
+    if Gem::Version.new(upgrade_status) < Gem::Version.new(UpgradeChecker.get_current_version) # thats how we compare the version
       return true
     end
 
@@ -59,9 +64,22 @@ class UpgradeChecker
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.3.0')
+      Thor::Shell::Basic.new.say_status 'warning', "The installation progress of docker-sync 0.3.0 has changed, brew is now mandatory - you need to uninstall docker-sync/unox/unison ! : \n\n_Please_ read :): https://github.com/EugenMayer/docker-sync/wiki/1.3-Upgrade-Guide\n\n", :red
+
+      cmd1 = 'rm -f /usr/loca/bin/unison-fsmonitor && gem uninstall docker-sync && brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/dockersync"'
+      Thor::Shell::Basic.new.say_status 'ok', "The installation progress of docker-sync 0.3.0 has changed, brew is now mandatory - you need to uninstall docker-sync/unox/unison ! : \n\n_Please_ read :): https://github.com/EugenMayer/docker-sync/wiki/1.3-Upgrade-Guide\n\n", :rwhite
+
+      if Thor::Shell::Basic.new.yes?('I will install reinstall docker-sync for you using the above command (y/N)')
+        system cmd1
+      else
+        raise('Please reinstall docker-sync yourself')
+        exit 1
+      end
+    end
+
 
     # update the upgrade_status
-    @config['upgrade_status'] = "#{UpgradeChecker.get_current_version}"
-    DockerSyncConfig::global_config_save(@config)
+    @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end
-end
+end

data/lib/docker-sync/watch_strategy/dummy.rb

@@ -1,6 +1,5 @@
 require 'thor/shell'
 require 'docker-sync/execution'
-require 'docker-sync/preconditions'
 
 module Docker_Sync
   module WatchStrategy

data/lib/docker-sync/watch_strategy/fswatch.rb

@@ -1,6 +1,6 @@
 require 'thor/shell'
 require 'docker-sync/execution'
-require 'docker-sync/preconditions'
+require 'docker-sync/preconditions/strategy'
 require 'pathname'
 
 module Docker_Sync
@@ -19,7 +19,7 @@ module Docker_Sync
         @events_to_watch = %w(AttributeModified Created Link MovedFrom MovedTo Renamed Removed Updated)
 
         begin
-          Preconditions::fswatch_available
+          DockerSync::Preconditions::Strategy.instance.fswatch_available
         rescue Exception => e
           say_status 'error', e.message, :red
           exit 1

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

@@ -1,6 +1,5 @@
 require 'thor/shell'
 require 'docker-sync/execution'
-require 'docker-sync/preconditions'
 require 'docker-sync/sync_strategy/unison'
 
 module Docker_Sync

data/tasks/daemon/daemon.thor

@@ -1,6 +1,6 @@
+require 'docker-sync'
 require 'docker-sync/sync_manager'
-require 'docker-sync/config'
-require 'docker-sync/preconditions'
+require 'docker-sync/preconditions/strategy'
 require 'docker-sync/update_check'
 require 'docker-sync/upgrade_check'
 require 'daemons'

data/tasks/stack/stack.thor

@@ -1,10 +1,12 @@
+require 'docker-sync'
 require 'docker-sync/sync_manager'
-require 'docker-sync/config'
-require 'docker-sync/preconditions'
+require 'docker-sync/preconditions/strategy'
 require 'docker-sync/update_check'
 require 'docker-sync/upgrade_check'
 require 'docker/compose'
 require 'docker-sync/compose'
+require 'docker-sync/config/project_config'
+
 class Stack < Thor
   class_option :config, :aliases => '-c', :default => nil, :type => :string, :desc => 'Path of the docker_sync config'
   class_option :sync_name, :aliases => '-n', :type => :string, :desc => 'If given, only this sync configuration will be references/started/synced'
@@ -26,26 +28,16 @@ class Stack < Thor
     upgrades.run
 
     begin
-      Preconditions::check_all_preconditions
+      config = DockerSync::ProjectConfig.new(config_path: options[:config])
+      DockerSync::Preconditions::Strategy.instance.check_all_preconditions(config)
     rescue Exception => e
       say_status 'error', e.message, :red
-      exit 1
-    end
-
-    if options[:config]
-      config_path = options[:config]
-    else
-      begin
-        config_path = DockerSyncConfig::project_config_path
-      rescue Exception => e
-        say_status 'error', e.message, :red
-        return
-      end
+      exit(1)
     end
 
     say_status 'note:', 'You can also run docker-sync in the background with docker-sync --daemon'
 
-    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(config: config)
     @sync_manager.run(options[:sync_name])
     global_options = @sync_manager.global_options
     @compose_manager = ComposeManager.new(global_options)
@@ -77,23 +69,14 @@ class Stack < Thor
     end
 
     begin
-      Preconditions::check_all_preconditions
+      config = DockerSync::ProjectConfig.new(config_path: options[:config])
+      DockerSync::Preconditions::Strategy.instance.check_all_preconditions(config)
     rescue Exception => e
       say_status 'error', e.message, :red
-      exit 1
+      exit(1)
     end
 
-    if options[:config]
-      config_path = options[:config]
-    else
-      begin
-        config_path = DockerSyncConfig::project_config_path
-      rescue Exception => e
-        say_status 'error', e.message, :red
-        return
-      end
-    end
-    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(config: config)
     global_options = @sync_manager.global_options
     # shutdown compose first
     @compose_manager = ComposeManager.new(global_options)
@@ -105,4 +88,3 @@ class Stack < Thor
     say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed their volumes', :green
   end
 end
-