docker-sync 0.4.6 → 0.5.0.pre.beta1

data/lib/docker-sync/upgrade_check.rb

@@ -11,6 +11,7 @@ class UpgradeChecker
   end
 
   def run
+    return if ENV['DOCKER_SYNC_SKIP_UPGRADE']
     unless should_run
       return
     end
@@ -50,6 +51,7 @@ class UpgradeChecker
   end
 
   def check_and_warn
+    return if ENV['DOCKER_SYNC_SKIP_UPGRADE']
     # this is the upgrade hook for the unison-unox introduction / rename of unison
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.1.0')
       Thor::Shell::Basic.new.say_status 'warning', 'Please be aware that with the strategy "unison" is now called unison-onesided and you might need to migrate. See https://github.com/EugenMayer/docker-sync/wiki/Migration-Guide for more informations', :red
@@ -75,7 +77,6 @@ class UpgradeChecker
         system cmd1
       else
         raise('Please reinstall docker-sync yourself')
-        exit 1
       end
     end
 

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

@@ -1,7 +1,7 @@
 require 'thor/shell'
 require 'docker-sync/execution'
 
-module Docker_Sync
+module DockerSync
   module WatchStrategy
     class Dummy
       include Thor::Shell

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

@@ -1,9 +1,8 @@
 require 'thor/shell'
 require 'docker-sync/execution'
-require 'docker-sync/preconditions/strategy'
 require 'pathname'
 
-module Docker_Sync
+module DockerSync
   module WatchStrategy
     class Fswatch
       include Thor::Shell
@@ -19,8 +18,8 @@ module Docker_Sync
         @events_to_watch = %w(AttributeModified Created Link MovedFrom MovedTo Renamed Removed Updated)
 
         begin
-          DockerSync::Preconditions::Strategy.instance.fswatch_available
-        rescue Exception => e
+          Dependencies::Fswatch.ensure!
+        rescue StandardError => e
           say_status 'error', e.message, :red
           exit 1
         end
@@ -43,7 +42,7 @@ module Docker_Sync
         say_status 'command', cmd, :white if @options['verbose']
 
         # run a thread here, since it is blocking
-        @watch_thread = threadexec(cmd, "Sync #{@sync_name}", :blue)
+        @watch_thread = thread_exec(cmd, "Sync #{@sync_name}", :blue)
       end
 
       def watch_options

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

@@ -1,7 +1,7 @@
 require 'thor/shell'
 require 'docker-sync/execution'
 
-module Docker_Sync
+module DockerSync
   module WatchStrategy
     class Remote_logs
       include Thor::Shell
@@ -17,13 +17,13 @@ module Docker_Sync
         @sync_name = sync_name
         @watch_fork = nil
         @watch_thread = nil
-        @unison = Docker_Sync::SyncStrategy::NativeOsx.new(@sync_name, @options)
+        @unison = DockerSync::SyncStrategy::NativeOsx.new(@sync_name, @options)
       end
 
       def run
         say_status 'success', "Showing unison logs from your sync container: #{@unison.get_container_name}", :green
         cmd = "docker exec #{@unison.get_container_name} tail -F /tmp/unison.log"
-        @watch_thread = threadexec(cmd, 'Sync Log:')
+        @watch_thread = thread_exec(cmd, 'Sync Log:')
       end
 
       def stop

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

@@ -2,7 +2,7 @@ require 'thor/shell'
 require 'docker-sync/execution'
 require 'docker-sync/sync_strategy/unison'
 
-module Docker_Sync
+module DockerSync
   module WatchStrategy
     class Unison
       include Execution
@@ -19,7 +19,7 @@ module Docker_Sync
         # unison sync and watch
         # basically unison watch is the command with the additionnal -repeat watch option
         # note: this doesn't run a sync
-        @unison = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+        @unison = DockerSync::SyncStrategy::Unison.new(@sync_name, @options)
       end
 
       def run

data/tasks/daemon/daemon.thor

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

data/tasks/stack/stack.thor

@@ -1,6 +1,5 @@
 require 'docker-sync'
 require 'docker-sync/sync_manager'
-require 'docker-sync/preconditions/strategy'
 require 'docker-sync/update_check'
 require 'docker-sync/upgrade_check'
 require 'docker/compose'
@@ -35,15 +34,15 @@ class Stack < Thor
 
     begin
       config = DockerSync::ProjectConfig.new(config_path: options[:config])
-      DockerSync::Preconditions::Strategy.instance.check_all_preconditions(config)
-    rescue Exception => e
+      DockerSync::Dependencies.ensure_all!(config)
+    rescue StandardError => e
       say_status 'error', e.message, :red
       exit(1)
     end
 
-    say_status 'note:', 'You can also run docker-sync in the background with docker-sync --daemon'
+    say_status 'note:', 'You can also run docker-sync in the background with docker-sync start'
 
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
+    @sync_manager = DockerSync::SyncManager.new(config: config)
     @sync_manager.run(options[:sync_name])
     global_options = @sync_manager.global_options
     @compose_manager = ComposeManager.new(global_options)
@@ -60,7 +59,7 @@ class Stack < Thor
 
         @sync_manager.stop
         @compose_manager.stop
-      rescue Exception => e
+      rescue StandardError => e
         puts "EXCEPTION: #{e.inspect}"
         puts "MESSAGE: #{e.message}"
     end
@@ -76,13 +75,13 @@ class Stack < Thor
 
     begin
       config = DockerSync::ProjectConfig.new(config_path: options[:config])
-      DockerSync::Preconditions::Strategy.instance.check_all_preconditions(config)
-    rescue Exception => e
+      DockerSync::Dependencies.ensure_all!(config)
+    rescue StandardError => e
       say_status 'error', e.message, :red
       exit(1)
     end
 
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
+    @sync_manager = DockerSync::SyncManager.new(config: config)
     global_options = @sync_manager.global_options
     # shutdown compose first
     @compose_manager = ComposeManager.new(global_options)

data/tasks/sync/sync.thor

@@ -1,6 +1,5 @@
 require 'docker-sync'
 require 'docker-sync/sync_manager'
-require 'docker-sync/preconditions/strategy'
 require 'docker-sync/update_check'
 require 'docker-sync/upgrade_check'
 require 'daemons'
@@ -34,7 +33,7 @@ class Sync < Thor
     UpgradeChecker.new.run
 
     config = config_preconditions
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
+    @sync_manager = DockerSync::SyncManager.new(config: config)
 
     start_dir = Dir.pwd # Set start_dir variable to be equal to pre-daemonized folder, since daemonizing will change dir to '/'
 
@@ -61,7 +60,7 @@ class Sync < Thor
     print_version if options[:version]
 
     config = config_preconditions
-    sync_manager = Docker_sync::SyncManager.new(config: config)
+    sync_manager = DockerSync::SyncManager.new(config: config)
     sync_manager.stop
     pid_file_path="#{options['dir']}/#{options['app_name']}.pid"
     if File.exist?(pid_file_path)
@@ -86,7 +85,7 @@ class Sync < Thor
 
     config = config_preconditions
 
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
+    @sync_manager = DockerSync::SyncManager.new(config: config)
     @sync_manager.sync(options[:sync_name])
   end
 
@@ -107,7 +106,7 @@ class Sync < Thor
     # Remove the .docker-sync directory
     FileUtils.rm_r dir if File.directory?(dir)
 
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
+    @sync_manager = DockerSync::SyncManager.new(config: config)
     @sync_manager.clean(options[:sync_name])
     say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed their volumes', :green
   end
@@ -129,27 +128,25 @@ class Sync < Thor
   def list
     print_version if options[:version]
 
-    config = config_preconditions
+    project_config = config_preconditions
 
-    say_status 'ok',"Found configuration at #{config.config_path}"
-    @sync_manager = Docker_sync::SyncManager.new(config: config)
-    @sync_manager.get_sync_points.each do |name, config|
-      say_status name, "On address #{config['sync_host_ip']}:#{config['sync_host_port']}",:white unless options['verbose']
-      puts "\n---------------[#{name}] #{config['sync_host_ip']}:#{config['sync_host_port']} ---------------\n" if options['verbose']
-      print_table(config) if options['verbose']
+    say_status 'ok',"Found configuration at #{project_config.config_path}"
+    @sync_manager = DockerSync::SyncManager.new(config: project_config)
+    @sync_manager.get_sync_points.each do |name, sync_config|
+      say_status name, "On address #{sync_config['sync_host_ip']}:#{sync_config['sync_host_port']}",:white unless options['verbose']
+      puts "\n---------------[#{name}] #{sync_config['sync_host_ip']}:#{sync_config['sync_host_port']} ---------------\n" if options['verbose']
+      print_table(sync_config) if options['verbose']
     end
   end
 
   no_tasks do
     def config_preconditions # Moved shared preconditions block into separate method to have less/cleaner code
-      begin
-        DockerSync::ProjectConfig.new(config_path: options[:config]).tap do |config|
-          DockerSync::Preconditions::Strategy.instance.check_all_preconditions(config)
-        end
-      rescue Exception => e
-        say_status 'error', e.message, :red
-        exit 1
+      DockerSync::ProjectConfig.new(config_path: options[:config]).tap do |config|
+        DockerSync::Dependencies.ensure_all!(config)
       end
+    rescue StandardError => e
+      say_status 'error', e.message, :red
+      exit 1
     end
 
     def daemonize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0.pre.beta1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -174,10 +174,22 @@ files:
 - lib/docker-sync/config/config_serializer.rb
 - lib/docker-sync/config/global_config.rb
 - lib/docker-sync/config/project_config.rb
+- lib/docker-sync/dependencies.rb
+- lib/docker-sync/dependencies/docker.rb
+- lib/docker-sync/dependencies/docker_driver.rb
+- lib/docker-sync/dependencies/fswatch.rb
+- lib/docker-sync/dependencies/package_manager.rb
+- lib/docker-sync/dependencies/package_managers/apt.rb
+- lib/docker-sync/dependencies/package_managers/base.rb
+- lib/docker-sync/dependencies/package_managers/brew.rb
+- lib/docker-sync/dependencies/package_managers/none.rb
+- lib/docker-sync/dependencies/package_managers/pkg.rb
+- lib/docker-sync/dependencies/package_managers/yum.rb
+- lib/docker-sync/dependencies/rsync.rb
+- lib/docker-sync/dependencies/unison.rb
+- lib/docker-sync/dependencies/unox.rb
+- lib/docker-sync/environment.rb
 - lib/docker-sync/execution.rb
-- lib/docker-sync/preconditions/preconditions_linux.rb
-- lib/docker-sync/preconditions/preconditions_osx.rb
-- lib/docker-sync/preconditions/strategy.rb
 - lib/docker-sync/sync_manager.rb
 - lib/docker-sync/sync_process.rb
 - lib/docker-sync/sync_strategy/native.rb
@@ -195,7 +207,7 @@ files:
 - tasks/sync/sync.thor
 homepage: https://github.com/EugenMayer/docker_sync
 licenses:
-- GPL
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -208,12 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Docker Sync - Fast and efficient way to sync code to docker-containers

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

@@ -1,51 +0,0 @@
-module DockerSync
-  module Preconditions
-    class Linux
-      def check_all_preconditions(config)
-        return unless should_run_precondition?
-
-        docker_available
-        docker_running
-
-        if config.unison_required?
-          unison_available
-        end
-
-        if config.rsync_required?
-          rsync_available
-          fswatch_available
-        end
-      end
-
-      def docker_available
-      end
-
-      def docker_running
-      end
-
-      def fswatch_available
-      end
-
-      def rsync_available
-      end
-
-      def unison_available
-      end
-
-      def is_driver_docker_for_mac?
-        return false
-      end
-
-      def is_driver_docker_toolbox?
-        return false
-      end
-      private
-
-      def should_run_precondition?(silent: false)
-        true
-      end
-
-
-    end
-  end
-end

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

@@ -1,174 +0,0 @@
-require 'mkmf'
-module DockerSync
-  module Preconditions
-    class Osx
-      def check_all_preconditions(config)
-        return unless should_run_precondition?
-
-        docker_available
-        docker_running
-
-        if config.unison_required?
-          unison_available
-        end
-
-        if config.rsync_required?
-          rsync_available
-          fswatch_available
-        end
-      end
-
-      def docker_available
-        if (find_executable0 'docker').nil?
-          raise('Could not find docker binary in path. Please install it, e.g. using "brew install docker" or install docker-for-mac')
-        end
-      end
-
-      def docker_running
-        `docker ps`
-        if $?.exitstatus > 0
-          raise('No docker daemon seems to be running. Did you start your docker-for-mac / docker-machine?')
-        end
-      end
-
-      def rsync_available
-        if should_run_precondition?
-          if (find_executable0 'rsync').nil?
-            raise('Could not find rsync binary in path. Please install it, e.g. using "brew install rsync"')
-          end
-        end
-      end
-
-      def unison_available
-        if should_run_precondition?
-          if (find_executable0 'unison').nil?
-            cmd1 = 'brew install unison'
-
-            Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison binary in $PATH. Trying to install now', :red
-            Thor::Shell::Basic.new.say_status 'command', cmd1, :white
-            if Thor::Shell::Basic.new.yes?('I will install unison using brew for you? (y/N)')
-              system cmd1
-            else
-              raise('Please install it yourself using: brew install unison')
-            end
-          end
-
-          unox_available
-        end
-      end
-
-      def fswatch_available
-        if should_run_precondition?
-          if (find_executable0 'fswatch').nil?
-            cmd1 = 'brew install fswatch'
-
-            Thor::Shell::Basic.new.say_status 'warning', 'No fswatch available. Install it by "brew install fswatch Trying to install now', :red
-            if Thor::Shell::Basic.new.yes?('I will install fswatch using brew for you? (y/N)')
-              system cmd1
-            else
-              raise('Please install it yourself using: brew install fswatch')
-            end
-          end
-        end
-
-      end
-
-      def is_driver_docker_for_mac?
-        `docker info | grep 'Docker Root Dir: /var/lib/docker' && docker info | grep 'Operating System: Alpine Linux'`
-        $?.success?
-      end
-
-      def is_driver_docker_toolbox?
-        return false unless find_executable0('docker-machine')
-        `docker info | grep 'Operating System: Boot2Docker'`
-        $?.success?
-      end
-
-      private
-
-      def should_run_precondition?(silent = false)
-        unless has_brew?
-          Thor::Shell::Basic.new.say_status 'info', 'Not running any precondition checks since you have no brew and that is unsupported. Is all up to you know.', :white unless silent
-          return false
-        end
-        return true
-      end
-
-      def has_brew?
-        return find_executable0 'brew'
-      end
-
-
-      def unox_available
-        if should_run_precondition?
-          if defined? Bundler
-            Bundler.with_clean_env { `brew list unox` } 
-          else
-            `brew list unox`
-          end
-          
-          unless $?.success?
-            # unox installed, but not using brew, we do not allow that anymore
-            if File.exist?('/usr/local/bin/unison-fsmonitor')
-              Thor::Shell::Basic.new.say_status 'error', 'You installed unison-fsmonitor (unox) not using brew-method - the old legacy way. We need to fix that.', :red
-
-              uninstall_cmd='sudo rm /usr/local/bin/unison-fsmonitor'
-              Thor::Shell::Basic.new.say_status 'command', uninstall_cmd, :white
-              if Thor::Shell::Basic.new.yes?('Should i uninstall the legacy /usr/local/bin/unison-fsmonitor for you ? (y/N)')
-                system uninstall_cmd
-              else
-                Thor::Shell::Basic.new.say_status 'error', 'Uninstall /usr/local/bin/unison-fsmonitor manually please', :white
-                exit 1
-              end
-            end
-
-            cmd1 = 'brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/unox'
-            Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison-fsmonitor (unox) binary in $PATH. Trying to install now', :red
-            Thor::Shell::Basic.new.say_status 'command', cmd1, :white
-            if Thor::Shell::Basic.new.yes?('I will install unox through brew for you? (y/N)')
-              system cmd1
-            else
-              raise("Please install it yourself using: #{cmd1}")
-            end
-          end
-        end
-      end
-
-      def install_pip(package, test = nil)
-        test ? `python -c 'import #{test}'` : `python -c 'import #{package}'`
-
-        unless $?.success?
-          Thor::Shell::Basic.new.say_status 'warning', "Could not find #{package}. Will try to install it using pip", :red
-          if find_executable0('python') == '/usr/bin/python'
-            Thor::Shell::Basic.new.say_status 'ok', 'You seem to use the system python, we will need sudo below'
-            sudo = true
-            cmd2 = "sudo easy_install pip && sudo pip install #{package}"
-          else
-            Thor::Shell::Basic.new.say_status 'ok', 'You seem to have a custom python, using non-sudo commands'
-            sudo = false
-            cmd2 = "easy_install pip && pip install #{package}"
-          end
-          if sudo
-            question = "I will ask you for you root password to install #{package} by running (This will ask for sudo, since we use the system python)"
-          else
-            question = "I will now install #{package} for you by running"
-          end
-
-          Thor::Shell::Basic.new.say_status 'info', "#{question}: `#{cmd2}\n\n"
-          if Thor::Shell::Basic.new.yes?('Shall I continue? (y/N)')
-            system cmd2
-            if $?.exitstatus > 0
-              raise("Failed to install #{package}, please file an issue with the output of the error")
-            end
-            test ? `python -c 'import #{test}'` : `python -c 'import #{package}'`
-            unless $?.success?
-              raise("Somehow I could not successfully install #{package} even though I tried. Please report this issue.")
-            end
-          else
-            raise("Please install #{package} manually, see https://github.com/EugenMayer/docker-sync/wiki/1.-Installation")
-          end
-        end
-      end
-    end
-  end
-end