docker-sync 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1a5236f02cd1af95a2c5dd4f958653a2fb3509
-  data.tar.gz: f9eea32e9ed875dcd767bd6c7309c7fe0aa0ea4b
+  metadata.gz: 5187439aee543a2580cae6188d1ff4e36a2d2fdc
+  data.tar.gz: 63ee4e96be043f0c1b7744e63c2c5da14575c2e9
 SHA512:
-  metadata.gz: ca288151453629511d80e24436ea0efb072cb83ec559787249873b85932814f876e7bd66dad3ad07c288210a0d44612aef58507adbe27eab98afe9c1f5fd2ce1
-  data.tar.gz: 515f0cda8d12222f52c2cd2f63566b8ae5ca8148b76b898fd5e3517fcddbd925743b96d65c4755990b8be3f5ddc09849b1e9bc673d303612014e67192f1a6626
+  metadata.gz: 45f6b738ef5138f7a9617694c519d83713cc7af09607f6ace0b3fd1125b37b820de4646448c09866c94d6ea325a729b81dc9bd88fab4524a138a8a114b34ff8d
+  data.tar.gz: 444d000796341735047b6f725e39ab2cbaa8bf1131161d6d1c093544d68328b5a48ad2b284f005137a2c05e32b81dd88d17b215889a935cf479a83461c192470

data/Thorfile

@@ -2,9 +2,6 @@
 $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

@@ -1 +1 @@
-0.0.9
+0.0.11

data/bin/docker-sync

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'thor'
 require 'update_check'
-DO_UPDATE_CHECK=true
-thor = File.expand_path('../../tasks', __FILE__)
+
+thor = File.expand_path('../../tasks/sync', __FILE__)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile
 }

data/bin/docker-sync-stack

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'thor'
+require 'update_check'
+
+# ensure docker-compose is installed, if not, do so
+begin
+  gem 'docker-compose'
+rescue Gem::LoadError
+  puts "docker-compose gem is missing, installing 'gem install docker-compose'"
+  system('gem install docker-compose')
+  puts 'docker-compose ruby gem installed, please start docker-sync-stack again'
+  exit 0
+end
+
+thor = File.expand_path('../../tasks/stack', __FILE__)
+Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
+  # noinspection RubyResolve
+  load taskfile
+}
+
+Stack.start

data/lib/compose.rb

@@ -0,0 +1,23 @@
+require 'docker/compose'
+
+class ComposeManager
+  include Thor::Shell
+  @compose_session
+  def initialize
+    @compose_session = Docker::Compose::Session.new(dir:'./')
+  end
+
+  def run
+    say_status 'ok','starting compose',:white
+    @compose_session.up
+    say_status 'success','started compose',:green
+  end
+
+  def stop
+    @compose_session.stop
+  end
+
+  def clean
+    @compose_session.down
+  end
+end

data/lib/config.rb

@@ -8,6 +8,11 @@ module DockerSyncConfig
     return File.expand_path('~/.docker-sync-global.yml')
   end
 
+  def is_first_run
+    global_config_path = global_config_location
+    return !File.exist?(global_config_path)
+  end
+
   def global_config
     global_config_path = global_config_location
     date = DateTime.new(2001, 1, 1) #paste
@@ -34,6 +39,7 @@ module DockerSyncConfig
       raise('No docker-sync.yml configuration found in your path ( traversing up ) Did you define it for your project?')
     end
   end
+
   # this has been ruthlessly stolen from Thor/runner.rb - please do not hunt me for that :)
   def find_config_file(skip_lookup = false)
     # Finds docker-sync.yml by traversing from your current directory down to the root

data/lib/docker_sync/sync_manager.rb

@@ -12,6 +12,7 @@ module Docker_Rsync
     @sync_processes
     @configurations
     @config_path
+
     def initialize(options)
       @sync_processes = []
       @config_syncs = []
@@ -26,7 +27,7 @@ module Docker_Rsync
         raise "Config could not be loaded from #{@config_path} - it does not exist"
       end
 
-      config =  YAML.load_file(@config_path)
+      config = YAML.load_file(@config_path)
       validate_config(config)
       @config_options = config['options'] || {}
       @config_syncs = config['syncs']
@@ -70,7 +71,7 @@ module Docker_Rsync
 
     def init_sync_processes(sync_name = nil)
       if sync_name.nil?
-        @config_syncs.each { |name,sync_configuration|
+        @config_syncs.each { |name, sync_configuration|
           @sync_processes.push(create_sync(name, sync_configuration))
         }
       else
@@ -102,27 +103,23 @@ module Docker_Rsync
       @sync_processes.each { |sync_process|
         sync_process.run
       }
+    end
 
+    def join_threads
       begin
         @sync_processes.each do |sync_process|
           sync_process.watch_thread.join
         end
 
       rescue SystemExit, Interrupt
-
-        puts "Shutting down..."
+        say_status 'shutdown', 'Shutting down...', :blue
         @sync_processes.each do |sync_process|
           sync_process.stop
         end
-        @sync_processes.each do |sync_process|
-          sync_process.watch_thread.kill
-        end
 
       rescue Exception => e
-
         puts "EXCEPTION: #{e.inspect}"
         puts "MESSAGE: #{e.message}"
-
       end
     end
 
@@ -132,7 +129,12 @@ module Docker_Rsync
     end
 
     def stop
-
+      @sync_processes.each { |sync_process|
+        sync_process.stop
+        unless sync_process.watch_thread.nil?
+          sync_process.watch_thread.kill
+        end
+      }
     end
   end
 end

data/lib/docker_sync/sync_strategy/unison.rb

@@ -55,9 +55,7 @@ module Docker_Sync
         args = []
 
         unless @options['sync_excludes'].nil?
-          # TODO: does unison support excludes as a command parameter? seems to be a config-value only
-          say_status 'warning','Excludes are yet not implemented for unison!', :yellow
-          #  args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+          args = @options['sync_excludes'].map { |pattern| "-ignore='Path #{pattern}'" } + args
         end
         args.push(@options['src'])
         args.push('-auto')

data/lib/update_check.rb

@@ -12,12 +12,13 @@ class UpdateChecker
 
   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
+      say_status 'hint','Skipping up-to-date check since it has been disabled in your ~/.docker-sync-global.yml configuration',:yellow
       return
     end
     unless should_run
       return
     end
+    check_rsync_image unless is_first_run # do not check the image if its the first run - since this it will be downloaded anyway
     check_and_warn(@config['update_enforce'])
   end
 
@@ -32,6 +33,18 @@ class UpdateChecker
     return false
   end
 
+  def check_rsync_image
+    say_status 'ok','Checking if a newer rsync image is available'
+
+    if system("docker pull eugenmayer/rsync | grep 'Downloaded newer image for'")
+      say_status 'warning', 'Downloaded newer image for rsync', :red
+      say_status 'warning', 'Please use "docker-sync clean" before you start docker-sync again', :red
+
+      exit 0
+    end
+    say_status 'success','Image is (now) up to date'
+  end
+
   def get_current_version
     path = File.expand_path('../../', __FILE__)
     return File.read("#{path}/VERSION")
@@ -55,6 +68,8 @@ class UpdateChecker
       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')
+        say_status 'success','Successfully updated, please restart docker-sync and check the changelog at https://github.com/EugenMayer/docker-sync/wiki/5.-Changelog',:green
+        exit 0
       else
         exit 1 if update_enforced
       end

data/tasks/stack/stack.thor

@@ -0,0 +1,93 @@
+require 'docker_sync/sync_manager'
+require 'config'
+require 'preconditions'
+require 'update_check'
+require 'compose'
+
+class Stack < Thor
+  include DockerSyncConfig
+  include Preconditions
+
+  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'
+
+  desc 'start', 'Start sync services, watcher and then your docker-compose defined stack'
+
+  def start
+    # do run update check in the start command only
+    updates = UpdateChecker.new
+    updates.run
+
+    begin
+      check_all_preconditions
+    rescue Exception => e
+      say_status 'error', e.message, :red
+      exit 1
+    end
+
+    if options[:config]
+      config_path = options[:config]
+    else
+      begin
+        config_path = find_config
+      rescue Exception => e
+        say_status 'error', e.message, :red
+        return
+      end
+    end
+
+    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager.run(options[:sync_name])
+
+    @compose_manager = ComposeManager.new
+
+    compose_thread = Thread.new {
+      @compose_manager.run
+    }
+
+    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}"
+
+    end
+  end
+
+  desc 'clean', 'compose down your app stack, stop and clean up all sync endpoints'
+
+  def clean
+    begin
+      check_all_preconditions
+    rescue Exception => e
+      say_status 'error', e.message, :red
+      exit 1
+    end
+
+    if options[:config]
+      config_path = options[:config]
+    else
+      begin
+        config_path = find_config
+      rescue Exception => e
+        say_status 'error', e.message, :red
+        return
+      end
+    end
+    @compose_manager = ComposeManager.new
+    @compose_manager.clean
+    say_status 'success', 'Finished cleaning up your app stack', :green
+
+    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager.clean(options[:sync_name])
+    say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed there volumes', :green
+  end
+end
+

data/tasks/{sync.thor → sync/sync.thor}

@@ -35,9 +35,10 @@ class Sync < Thor
     end
     @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
     @sync_manager.run(options[:sync_name])
+    @sync_manager.join_threads
   end
 
-  desc 'sync_only', 'sync - do not start a watcher'
+  desc 'sync', 'sync - do not start a watcher'
   def sync
     begin
       check_all_preconditions
@@ -87,7 +88,6 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Eugen Mayer
@@ -16,39 +16,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: gem_update_checker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Sync your code live to docker-containers without losing any performance
   on OSX
 email: eugen.mayer@kontextwork.de
 executables:
 - docker-sync
+- docker-sync-stack
 extensions: []
 extra_rdoc_files: []
 files:
 - Thorfile
 - VERSION
 - bin/docker-sync
+- bin/docker-sync-stack
+- lib/compose.rb
 - lib/config.rb
 - lib/docker_sync/sync_manager.rb
 - lib/docker_sync/sync_process.rb
@@ -58,7 +73,8 @@ files:
 - lib/execution.rb
 - lib/preconditions.rb
 - lib/update_check.rb
-- tasks/sync.thor
+- tasks/stack/stack.thor
+- tasks/sync/sync.thor
 homepage: https://github.com/EugenMayer/docker_sync
 licenses:
 - GPL