docker-sync 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b96d12026f794c7f137c039fb0389e8a2bd9f99
-  data.tar.gz: 3fdd3d6be8832db97540a5b36fffe0ba8e92c810
+  metadata.gz: 2c634ad99d5e88d69c686388e3346c96b3d2c30f
+  data.tar.gz: d87d180c0ca6bbe42c7b29fd8d3d90ee203edfb0
 SHA512:
-  metadata.gz: f20e0ed261406702dad8118c901157f815832261d811d839fc53f290206ce84132136f6f6c4dc7d58d2b01c0b28c689e76886326e04937b5dba9f17ab1172c7b
-  data.tar.gz: ea92cf7f46e23dd7b396215f6f68bdadfcbf4f6b1169d3a954820fb41ccb73466e1df6d4153704ec98f08a4b2f7f10454eda6fcbbd1f4f430a9882fde3f791da
+  metadata.gz: 0dbce940c38568427f7c2a845ed380caec3f41ccb6f5a3beb4d0ef16cf1913b5dc5ee4a2586785423529c242100710b09a4311d26dd436ed964e9820d86f85c9
+  data.tar.gz: ffa6b76d564ee17c3fa1a34e56a37138de831996cab2da60765aeb635b62150accd41579377e5dbaf9789005f71845b8c0242c5034f93ba5acc27b01c2c41c2a

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/docker-sync/config.rb

@@ -8,7 +8,12 @@ require 'docker-sync/config_template'
 module DockerSyncConfig
 
   def initialize(options)
-    Dotenv.load
+    load_dotenv
+  end
+
+  def self.load_dotenv
+    env_file = ENV.fetch('DOCKER_SYNC_ENV_FILE', '.env')
+    Dotenv.load(env_file)
   end
 
   def self.global_config_location
@@ -112,4 +117,4 @@ module DockerSyncConfig
   def self.escape_globs(path)
     path.to_s.gsub(/[*?{}\[\]]/, '\\\\\\&')
   end
-end
+end

data/lib/docker-sync/config_template.rb

@@ -2,13 +2,16 @@ require "yaml"
 require 'dotenv'
 
 module ConfigTemplate
-  def self.interpolate_config_file(config_path)
+  def self.interpolate_config_string(config_string)
       env_hash = {}
       ENV.each {|k,v| env_hash[k.to_sym] = v }
-      # assuming the checks that file exist have already been performed
-      config_string = File.read(config_path)
       config_string.gsub!('${', '%{')
       config_string = config_string % env_hash
       return YAML.load(config_string)
   end
+  def self.interpolate_config_file(config_path)
+      # assuming the checks that file exist have already been performed
+      config_string = File.read(config_path)
+      self.interpolate_config_string(config_string)
+  end
 end

data/lib/docker-sync/preconditions.rb

@@ -55,7 +55,7 @@ module Preconditions
       if Thor::Shell::Basic.new.yes?('Shall I install unison-fsmonitor for you? (y/N)')
         system cmd1
       else
-        raise("Please install it, see https://github.com/hnsl/unox, or simply run :\n #{cmd1} && #{cmd2}")
+        raise("Please install it, see https://github.com/hnsl/unox, or simply run :\n #{cmd1}")
       end
     end
 
@@ -65,7 +65,6 @@ module Preconditions
     `python -c 'import fsevents'`
     unless $?.success?
       Thor::Shell::Basic.new.say_status 'warning','Could not find macfsevents. Will try to install it using pip', :red
-      sudo = false
       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

data/lib/docker-sync/sync_manager.rb

@@ -6,6 +6,7 @@ require 'docker-sync/execution'
 require 'yaml'
 require 'dotenv'
 require 'docker-sync/config_template'
+require 'docker-sync/config'
 
 module Docker_sync
   class SyncManager
@@ -16,21 +17,26 @@ module Docker_sync
     @config_path
 
     def initialize(options)
-      Dotenv.load
+      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
+    def load_configuration_file
       unless File.exist?(@config_path)
         raise "Config could not be loaded from #{@config_path} - it does not exist"
       end
-
-      config = ConfigTemplate::interpolate_config_file(@config_path)
+      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'] || {}
@@ -66,6 +72,11 @@ module Docker_sync
           end
         end
 
+        # set default value for 'dest'
+        if !@config_syncs[name].key?('dest')
+          @config_syncs[name]['dest'] = '/sync'
+        end
+
         # for each strategy check if a custom image has been defined and inject that into the sync-endpoints
         # which do fit for this strategy
         %w(rsync unison).each do |strategy|
@@ -89,7 +100,7 @@ module Docker_sync
     end
 
     def validate_sync_config(name, sync_config)
-      config_mandatory = %w[src dest]
+      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)

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

@@ -132,13 +132,13 @@ module Docker_Sync
       end
 
       def stop_container
-        `docker stop #{get_container_name}`
+        `docker ps | grep #{get_container_name} && docker stop #{get_container_name}`
       end
 
       def reset_container
         stop_container
-        `docker rm #{get_container_name}`
-        `docker volume rm #{get_volume_name}`
+        `docker ps -a | grep #{get_container_name} && docker rm #{get_container_name}`
+        `docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}`
       end
 
       def clean

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

@@ -217,13 +217,13 @@ module Docker_Sync
       end
 
       def stop_container
-        `docker stop #{get_container_name}`
+        `docker ps | grep #{get_container_name} && docker stop #{get_container_name}`
       end
 
       def reset_container
         stop_container
-        `docker rm #{get_container_name}`
-        `docker volume rm #{get_volume_name}`
+        `docker ps -a | grep #{get_container_name} && docker rm #{get_container_name}`
+        `docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}`
       end
 
       def clean

data/tasks/sync/sync.thor

@@ -152,7 +152,7 @@ class Sync < Thor
 
       # Check to see if we're already running:
       if daemon_running?
-        say_status 'error', "docker-sync already started for this configuration", :red
+        say_status 'warning', 'docker-sync already started for this configuration', :yellow
         exit 1
       end
 

metadata

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