fulmar 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cfe568cca222bdb6219e38d6baae83190d53875
-  data.tar.gz: 4f3c471f4b47dbbf502a41591cc1a9d9a8b960aa
+  metadata.gz: 99ced20c31e852a42ba296fef2e83456379fd192
+  data.tar.gz: 1be06bf27f2a58794bea68457e1e72ac3b902d07
 SHA512:
-  metadata.gz: 9164acd81b792d4f219c4bb3409a44b0ce6dadc040f2063cb2ff6eed6918d2289502bceb9b2913197637378eab39d1b2b7808e0f4fdf5c69512083bf7804ff78
-  data.tar.gz: f39fbecf617814bb558413ed16948688dbb09125d92ba4c3c46b6a7a2fb04168aa6669d9ccb1f41bfbb1a6bdf1b08a0d4fc92d06a4d84b74921c2896625869b0
+  metadata.gz: 2e76c556be93ddbf070d679425faa1ecab863de50f49b3c37f1a67852ebf5f97afd191379a40305dd18a53f3904e988440edadf9c02dbfc83ec64304bdc7b740
+  data.tar.gz: 46bebcb2331f5c03f09f568c68886a957fe234e642cffa4aa8fba1ab0b112f33f9646e48c89f21697fe468248b28e352175a12b2d376ea93fbe99328dd5895b3

data/lib/fulmar/domain/service/dependency_service.rb

@@ -34,7 +34,7 @@ module Fulmar
             next unless data[:type].blank? || data[:type] == 'git'
             git = Rugged::Repository.new(data[:path])
 
-            checkout(git, data)
+            handle_uncommitted_changes(git, data)
 
             # Pull
             shell = Fulmar::Infrastructure::Service::ShellService.new data[:path]
@@ -46,7 +46,34 @@ module Fulmar
 
         protected
 
+        ##
+        # Runs a defined update policy to avoid git conflicts
+        # @param git [Rugged::Repository]
+        # @param dependency [Hash]
+        def handle_uncommitted_changes(git, dependency)
+          policy = dependency[:update_policy] || ''
+
+          case policy
+          when 'reset'
+            reset(git)
+          when -> (p) { p.nil? || p.empty? }
+            puts 'No update policy configured'
+          else
+            puts "Unexpected update policy #{policy}"
+          end
+        end
+
+        ##
+        # Reset changes
+        # @param git [Rugged::Repository]
+        def reset(git)
+          head = git.head
+          git.reset(head.target_id, :hard) unless head.nil?
+        end
+
         def checkout(git, dependency)
+          handle_uncommitted_changes(git, dependency)
+
           # Switch to the configured branch/tag/commit
           if git.branches.select { |b| b.name.split('/').last == dependency[:ref] }.any?
             checkout_branch(git, dependency[:ref])

data/lib/fulmar/infrastructure/service/database/database_service.rb

@@ -74,18 +74,24 @@ module Fulmar
             disconnect unless state_before
           end
 
+          def command(binary)
+            command = binary
+            command << " -h #{@config[:maria][:host]}" unless @config[:maria][:host].blank?
+            command << " -u #{@config[:maria][:user]}" unless @config[:maria][:user].blank?
+            command << " --password='#{@config[:maria][:password]}'" unless @config[:maria][:password].blank?
+            command
+          end
+
           def dump(filename = backup_filename)
             filename = "#{@config[:remote_path]}/#{filename}" unless filename[0, 1] == '/'
 
-            @shell.run "mysqldump -h #{@config[:maria][:host]} -u #{@config[:maria][:user]} --password='#{@config[:maria][:password]}' " \
-                       "#{@config[:maria][:database]} --single-transaction #{diffable} #{ignore_tables} -r \"#{filename}\""
+            @shell.run "#{command('mysqldump')} #{@config[:maria][:database]} --single-transaction #{diffable} #{ignore_tables} -r \"#{filename}\""
 
             filename
           end
 
           def load_dump(dump_file, database = @config[:maria][:database])
-            @shell.run "mysql -h #{@config[:maria][:host]} -u #{@config[:maria][:user]} --password='#{@config[:maria][:password]}' " \
-                       "-D #{database} < #{dump_file}"
+            @shell.run "#{command('mysql')} -D #{database} < #{dump_file}"
           end
 
           def download_dump(filename = backup_filename)

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.8.5'
+  VERSION = '1.8.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler