fulmar 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd3e3b5554ae9fb5d26cb39d2edfb58e4014654
-  data.tar.gz: bbef26b1c6d2d97bcae7fd2574790403325402fa
+  metadata.gz: 78b184a38399a1bb85893abc9f4cc757ecd97b17
+  data.tar.gz: 752c373642fcc1cb7792dc6388b98b2b1b91e85d
 SHA512:
-  metadata.gz: 80a6fc309f815a0ee2a024bc0ce79d0734f86bc007be600889bc43587cb565ee32fbf36774e453915b0af0ab80b8f32e0f60618679a9acc051a20102e57da817
-  data.tar.gz: 3d8e18c4f150381a44d8a8bc81631363886ea776514071603ec46e546af72ad18a6792eec0c660a254d05fe85d433645a7aea59b9bcaed80cec809c5e43970a4
+  metadata.gz: bade5b1220e87a60d0f457135401cd19316de60a1bf442fa4f783683b675fcc0300f6b16faece6e08ab5b97fcaef3264e9eeb714d3a413d04ca32e1d4330be63
+  data.tar.gz: 58b425a5cfde5d6be795a05caa89e071083a4431e262de56693eb5fcc8db628ef20743729c90f19be23c75e1e0d082814e3d176a0297b9eb276e9ff20dd3a55b

data/Gemfile

@@ -2,12 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fulmar.gemspec
 gemspec
-
-gem 'rake'
-gem 'mysql2'
-gem 'git'
-
-source 'http://dione.core4.lan:9292' do
-  gem 'ruby_wings'
-  gem 'fulmar-shell', '>= 1.1.0'
-end

data/README.md

@@ -2,6 +2,9 @@
 
 Fulmar is a task manager for deployments.
 
+This project is still under heavy development for the next few weeks. You might want to check back in May 2015. We hope
+to get this somehow stable until then.
+
 ## Installation
 
 Add this line to your application's Gemfile:

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

@@ -21,12 +21,12 @@ module Fulmar
 
         # Allow access of configuration via array/hash access methods (read access)
         def [](id)
-          (@environment.nil? || @target.nil?) ? nil : configuration[:environments][@environment][@target][id]
+          ready? ? configuration[:environments][@environment][@target][id] : nil
         end
 
         # Allow access of configuration via array/hash access methods (write access)
         def []=(id, value)
-          if @environment && @target
+          if ready?
             configuration[:environments][@environment][@target][id] = value
           else
             fail 'Environment or target not set. Please set both variables via configuration.environment = \'xxx\' / '\
@@ -35,7 +35,7 @@ module Fulmar
         end
 
         def to_hash
-          (@environment.nil? || @target.nil?) ? configuration : configuration[:environments][@environment][@target]
+          ready? ? configuration[:environments][@environment][@target] : configuration
         end
 
         def base_path
@@ -58,6 +58,10 @@ module Fulmar
           @target = target ? target.to_sym : nil
         end
 
+        def ready?
+          !@environment.nil? && !@target.nil?
+        end
+
         # Merge another configuration into the currently active one
         # Useful for supplying a default configuration, as values are not overwritten.
         # Hashes are merged.
@@ -105,10 +109,19 @@ module Fulmar
           # Iterate over all environments and targets to prepare them
           @config[:environments].each_key do |env|
             next if env == :all
-            @config[:environments][env].each_key { |target| fill_target(env, target) }
+            @config[:environments][env].each_key do |target|
+              fill_target(env, target)
+              check_path(env, target)
+            end
           end
           @config
         end
+
+        def check_path(env, target)
+          unless @config[:environments][env][target][:local_path].blank?
+            @config[:environments][env][target][:local_path] = File.expand_path(@config[:environments][env][target][:local_path])
+          end
+        end
       end
     end
   end

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

@@ -24,16 +24,16 @@ module Fulmar
           def initialize(config)
             @config = config
             @config.merge DEFAULT_CONFIG
-            @shell = Fulmar::Infrastructure::Service::ShellService.new(config[:local_path], config[:hostname])
             @tunnel = nil
             @client = nil
+            initialize_shell
             config_test
           end
 
           def connect
             options = compile_options
 
-            if @config[:maria][:hostname] != 'localhost' && @config[:maria][:hostname] != '127.0.0.1'
+            unless local?
               tunnel.open
               options[:port] = tunnel.local_port
             end
@@ -62,6 +62,10 @@ module Fulmar
             @connected
           end
 
+          def local?
+            @config[:maria][:hostname] == 'localhost' || @config[:maria][:hostname] == '127.0.0.1'
+          end
+
           def tunnel
             @tunnel ||= Fulmar::Infrastructure::Service::TunnelService.new(@config[:maria][:hostname], @config[:maria][:port])
           end
@@ -128,6 +132,12 @@ module Fulmar
             "#{@config[:maria][:database]}_#{Time.now.strftime('%Y-%m-%dT%H%M%S')}.sql"
           end
 
+          def initialize_shell
+            path = local? ? @config[:local_path] : @config[:remote_path]
+            @shell = Fulmar::Infrastructure::Service::ShellService.new(path, @config[:hostname])
+            @shell.debug = true if @config[:debug]
+          end
+
           # Compiles a mysql config hash from valid options of the fulmar config
           def compile_options
             possible_options = [:host, :username, :password, :port, :encoding, :socket, :read_timeout, :write_timeout,

data/lib/fulmar/service/common_helper_service.rb

@@ -20,11 +20,19 @@ module Fulmar
         end
 
         def local_shell
-          @_local_shell ||= Fulmar::Infrastructure::Service::ShellService.new configuration[:local_path]
+          fail 'You need to set an environment and a target first' unless configuration.ready?
+          unless @_local_shell
+            @_local_shell = {}
+          end
+          @_local_shell["#{configuration.environment}:#{configuration.target}"] ||= Fulmar::Infrastructure::Service::ShellService.new configuration[:local_path]
         end
 
         def remote_shell
-          @_remote_shell ||= Fulmar::Infrastructure::Service::ShellService.new(configuration[:remote_path], configuration[:hostname])
+          fail 'You need to set an environment and a target first' unless configuration.ready?
+          unless @_remote_shell
+            @_remote_shell = {}
+          end
+          @_remote_shell["#{configuration.environment}:#{configuration.target}"] ||= Fulmar::Infrastructure::Service::ShellService.new(configuration[:remote_path], configuration[:hostname])
         end
 
         def file_sync

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jonas Siegl