fulmar 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c85744adefad501d5efd90fef1a22ebf0f8f51
-  data.tar.gz: d6dfa27af53d6ba87f51699583d2ab0edc55cedd
+  metadata.gz: ec0fe71a95742d097b3d61053620fee7453fcd7f
+  data.tar.gz: d92d58a45c299f073afb02ea32e26fe2344b3d68
 SHA512:
-  metadata.gz: 5c5e48948f29b756590a48c0ddae233d08b21787f4d588604abce5a0da6d6547b889ea2b484c4136ff8798d7b80939e0d9eb0822a98ffd7ed99c1652341c6af0
-  data.tar.gz: 194914af1388156b2f492c90027885e99717296751e878e5f72d52f44cc0660d59b96785013a0b45ee5ba183f58dceb9a5dea1a5367ddf3c4b1ea3be9b6b57e6
+  metadata.gz: 7f8ebdc7e5247a90f35db2c30bfbef6630679f05b25b689325e2d984f3d23032df58e1e69d37e9981dac0461b28e2ed972badecc351965d11bdb8c35cb4a590e
+  data.tar.gz: 777be47a8bb21a2343fd5d8934464f3000133f8b287206a6afa3eee9d4cd8de90c99fbfca80524d189f038304c5030937c63322b9f6f538b93982bf63cfff347

data/fulmar.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
 
   spec.add_runtime_dependency 'rake', '~>10'
-  spec.add_runtime_dependency 'git', '~>1.2'
+  spec.add_runtime_dependency 'rugged', '~>0'
   spec.add_runtime_dependency 'mysql2', '~>0.3'
   spec.add_runtime_dependency 'fulmar-shell', '~>1', '>=1.4.0'
   spec.add_runtime_dependency 'ruby_wings', '~>0.1', '>=0.1.0'
+  spec.add_runtime_dependency 'colorize', '~>0'
 end

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

@@ -30,7 +30,7 @@ module Fulmar
         end
 
         def wrap_environment
-          Proc.new do
+          proc do
             configuration = Fulmar::Domain::Service::ConfigurationService.instance
             environment = configuration.environment
             target = configuration.target

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

@@ -11,7 +11,8 @@ module Fulmar
 
         def render
           return unless @config[:config_templates]
-          @config[:config_templates].each do |template|
+          @config[:config_templates].each do |template_file|
+            template = "#{@config[:local_path]}/#{template_file}"
             fail "Template filenames must end in .erb - '#{template}' does not" unless template[-4, 4] == '.erb'
             fail "Cannot render missing config file '#{template}'" unless File.exist? template
 

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

@@ -33,7 +33,7 @@ module Fulmar
           else
             fail 'Environment or target not set. Please set both variables via configuration.environment = \'xxx\' / '\
                  'configuration.target = \'yyy\''
-            end
+          end
         end
 
         def to_hash
@@ -61,10 +61,13 @@ module Fulmar
         end
 
         def ready?
-          !@environment.nil? && !@target.nil?
+          return false if @environment.nil? || @target.nil?
+          fail 'Environment is invalid' if configuration[:environments][@environment].nil?
+          fail 'Target is invalid' if configuration[:environments][@environment][@target].nil?
+          true
         end
 
-        def has_feature?(feature)
+        def feature?(feature)
           return configuration[:features][feature] unless configuration[:features][feature].nil?
           case feature
           when :database
@@ -84,7 +87,7 @@ module Fulmar
 
         def any?
           if block_given?
-            each{ |_env, _target, data| return true if yield(data) }
+            each { |_env, _target, data| return true if yield(data) }
             false
           else
             configuration[:environments].any?
@@ -96,9 +99,8 @@ module Fulmar
         # Hashes are merged.
         # @param [Hash] other
         def merge(other)
-          if @environment && @target
-            configuration[:environments][@environment][@target] = other.deep_merge(configuration[:environments][@environment][@target])
-          end
+          return unless @environment && @target
+          configuration[:environments][@environment][@target] = other.deep_merge(configuration[:environments][@environment][@target])
         end
 
         def config_files
@@ -121,25 +123,25 @@ module Fulmar
         # Fills a target with all globally set variables so all necessary information
         # is found within each target
         def fill_target(env, target)
-          @config[:environments][env][target] = @config[:environments][:all].deep_merge(@config[:environments][env][target])
-
-          unless @config[:environments][env][target][:host].blank?
-            host = @config[:environments][env][target][:host].to_sym
-            if @config[:hosts] && @config[:hosts][host]
-              @config[:hosts][host].each do
-                @config[:environments][env][target] = @config[:hosts][host].deep_merge(@config[:environments][env][target])
-              end
-            else
-              fail "Host #{host} is not configured."
+          @config[:environments][env][target] = @config[:environments][:all].deep_merge(@config[:environments][env][target]) if @config[:environments][:all]
+
+          return if @config[:environments][env][target][:host].blank?
+
+          host = @config[:environments][env][target][:host].to_sym
+          if @config[:hosts] && @config[:hosts][host]
+            @config[:hosts][host].each do
+              @config[:environments][env][target] = @config[:hosts][host].deep_merge(@config[:environments][env][target])
             end
+          else
+            fail "Host #{host} is not configured."
           end
         end
 
         # Loads the configuration from the YAML file and populates all targets
         def load_configuration
-          @config = { environments: {}, features: {} }
+          @config = { environments: {}, features: {}, hosts: {} }
           config_files.each do |config_file|
-            @config = @config.deep_merge(YAML.load_file(config_file).symbolize)
+            @config = @config.deep_merge((YAML.load_file(config_file) || {}).symbolize)
           end
 
           # Iterate over all environments and targets to prepare them
@@ -155,9 +157,8 @@ module Fulmar
         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
+          return if @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

data/lib/fulmar/domain/task/base.rake

@@ -1,11 +1,11 @@
 include Fulmar::Domain::Service::Helper::CommonHelper
 
-if configuration.has_feature? :database
+if configuration.feature? :database
   require 'fulmar/service/helper/database_helper'
   include Fulmar::Domain::Service::Helper::DatabaseHelper
 end
 
-if configuration.has_feature? :flow
+if configuration.feature? :flow
   require 'fulmar/service/helper/flow_helper'
   include Fulmar::Domain::Service::Helper::FlowHelper
-end
+end

data/lib/fulmar/domain/task/database_sync.rake

@@ -39,8 +39,6 @@ end
 
 if db_configs.any?
   namespace :database do
-    if db_configs.count > 1
-      create_update_tasks(db_configs)
-    end
+    create_update_tasks(db_configs) if db_configs.count > 1
   end
 end

data/lib/fulmar/domain/task/versions.rake

@@ -1,12 +1,7 @@
 include Fulmar::Domain::Service::Helper::CommonHelper
 
 namespace :versions do
-
   @versioned_servers = {}
-  configuration.each do |env, target, data|
-
-  end
-
 
   full_configuration[:environments].each_pair do |env, targets|
     next if env == :all
@@ -23,7 +18,7 @@ namespace :versions do
         task env do
           configuration.environment = env.split(':').first
           configuration.target = env.split(':').last
-          file_sync.list_releases(false).each{|item| puts item}
+          file_sync.list_releases(false).each { |item| puts item }
         end
       end
     end
@@ -38,7 +33,5 @@ namespace :versions do
         end
       end
     end
-
-
   end
 end

data/lib/fulmar/infrastructure/service/composer_service.rb

@@ -3,12 +3,13 @@ module Fulmar
     module Service
       # Provides access to composer
       class ComposerService
-        def initialize(custom_path = '/usr/bin/env composer')
+        def initialize(shell, custom_path = '/usr/bin/env composer')
+          @local_shell = shell
           @path = custom_path
         end
 
         def execute(command, arguments = [])
-          system "#{@path} #{command} #{arguments.join(' ')} > /dev/null"
+          @local_shell.run "#{@path} #{command} #{arguments.join(' ')} > /dev/null"
         end
       end
     end

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

@@ -8,7 +8,8 @@ module Fulmar
         # Provides basic methods common to all database services
         class DatabaseService
           attr_accessor :client
-          attr_reader :shell
+          attr_reader :shell, :connected
+          alias_method :connected?, :connected
 
           DEFAULT_CONFIG = {
             maria: {
@@ -16,7 +17,7 @@ module Fulmar
               port: 3306,
               user: 'root',
               password: '',
-              encoding: 'utf8',
+              encoding: 'utf8'
             }
           }
 
@@ -39,13 +40,7 @@ module Fulmar
 
             # Wait max 3 seconds for the tunnel to establish
             4.times do |i|
-              begin
-                @client = Mysql2::Client.new options
-                break
-              rescue Mysql2::Error => e
-                sleep 1 if i < 3
-                fail e.message if i == 3
-              end
+              break if try_connect(options, i)
             end
 
             @connected = true
@@ -57,10 +52,6 @@ module Fulmar
             @tunnel.close if @tunnel # using the variable directly avoids creating a tunnel instance when closing the database connection
           end
 
-          def connected?
-            @connected
-          end
-
           def local?
             @config[:hostname] == 'localhost'
           end
@@ -109,6 +100,13 @@ module Fulmar
 
           protected
 
+          def try_connect(options, i)
+            @client = Mysql2::Client.new options
+          rescue Mysql2::Error => e
+            sleep 1 if i < 3
+            raise e.message if i == 3
+          end
+
           # Test configuration
           def config_test
             fail 'Configuration option "database" missing.' unless @config[:maria][:database]
@@ -132,19 +130,17 @@ module Fulmar
           # 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,
-                             :connect_timeout, :reconnect, :local_infile, :secure_auth, :default_file, :default_group,
-                             :init_command
-                            ]
-            options = {}
-            options[:host] = '127.0.0.1'
-            options[:username] = @config[:maria][:user]
+                                :connect_timeout, :reconnect, :local_infile, :secure_auth, :default_file, :default_group,
+                                :init_command
+                               ]
+            options = { host: '127.0.0.1', username: @config[:maria][:user] }
+
             possible_options.each do |option|
               options[option] = @config[:maria][option] unless @config[:maria][option].nil?
             end
 
             options
           end
-
         end
       end
     end

data/lib/fulmar/infrastructure/service/git_service.rb

@@ -1,4 +1,4 @@
-require 'git'
+require 'rugged'
 
 module Fulmar
   module Infrastructure
@@ -29,29 +29,27 @@ module Fulmar
                                      end
           end
 
-          @git = Git.open(@config[:local_path]) # :log => Logger.new(STDOUT)
+          @git = Rugged::Repository.new(@config[:local_path]) # :log => Logger.new(STDOUT)
         end
 
         def branches
-          @git.branches
+          @git.branches.collect(:name)
         end
 
         def feature_branches
-          @git.branches.collect { |b| b.full }.select { |name| name.match(/^feature_/) }.sort
+          branches.select { |name| name.match(/^feature_/) }.sort
         end
 
         def preview_branches
-          @git.branches.collect { |b| b.full }.select { |name| name.match(/^preview_/) }.sort
+          branches.select { |name| name.match(/^preview_/) }.sort
         end
 
         def checkout(branch_name = derive_branch_name)
-          branches = @git.branches.local.find(branch_name)
-          if branches.any?
+          if branches.include?(branch_name)
             @git.checkout(branches.first)
           else
-            branches = @git.branches.remote.find(branch_name)
+            branches = @git.branches.select { |b| b.name.match(/\/#{branch_name}$/) }
             fail "Cannot find a valid branch, last search was for #{branch_name}" unless branches.any?
-            @git.branch(branches.first)
             @git.checkout(branches.first)
           end
         end
@@ -60,7 +58,6 @@ module Fulmar
         def derive_branch_name
           @config[:git][:branch] == 'preview' ? preview_branches.last : @config[:git][:branch]
         end
-
       end
     end
   end

data/lib/fulmar/infrastructure/service/transfer/rsync.rb

@@ -33,14 +33,8 @@ module Fulmar
             @local_shell.run rsync_command
           end
 
+          # Build the rsync command from the given options
           def rsync_command
-            options = ['-rl']
-            options << "--exclude='#{@config[:rsync][:exclude]}'" if @config[:rsync][:exclude]
-            options << "--exclude-from='#{@config[:rsync][:exclude_file]}'" if @config[:rsync][:exclude_file]
-            options << "--chown='#{@config[:rsync][:chown]}'" if @config[:rsync][:chown]
-            options << "--chmod='#{@config[:rsync][:chmod]}'" if @config[:rsync][:chmod]
-            options << '--delete' if @config[:rsync][:delete]
-
             if @config[:rsync][:direction] == 'up'
               from = @config[:local_path]
               to = ssh_user_and_host + ':' + @config[:remote_path]
@@ -49,7 +43,20 @@ module Fulmar
               to = @config[:local_path]
             end
 
-            "rsync #{options.join(' ')} '#{from}/' '#{to}'"
+            "rsync #{rsync_command_options.join(' ')} '#{from}/' '#{to}'"
+          end
+
+          protected
+
+          # Assembles all rsync command line parameters from the configuration options
+          def rsync_command_options
+            options = ['-rl']
+            options << "--exclude='#{@config[:rsync][:exclude]}'" if @config[:rsync][:exclude]
+            options << "--exclude-from='#{@config[:rsync][:exclude_file]}'" if @config[:rsync][:exclude_file]
+            options << "--chown='#{@config[:rsync][:chown]}'" if @config[:rsync][:chown]
+            options << "--chmod='#{@config[:rsync][:chmod]}'" if @config[:rsync][:chmod]
+            options << '--delete' if @config[:rsync][:delete]
+            options
           end
         end
       end

data/lib/fulmar/infrastructure/service/tunnel_service.rb

@@ -3,6 +3,7 @@ require 'socket'
 module Fulmar
   module Infrastructure
     module Service
+      # Opens an ssh tunnel to a remote host so other services can access mysql for example
       class TunnelService
         attr_reader :host, :remote_port, :local_port
 
@@ -31,20 +32,18 @@ module Fulmar
         end
 
         def free_port
-          port = 60000
-          begin
-            1000.times do
+          (60_000..61_000).each do |port|
+            begin
               socket = TCPSocket.new('localhost', port)
               socket.close
-              port += 1
+            rescue Errno::ECONNREFUSED
+              return port
             end
-          rescue Errno::ECONNREFUSED
-            return port
           end
+
           fail 'Cannot find an open local port'
-          0
         end
       end
     end
   end
-end
+end

data/lib/fulmar/service/helper/common_helper.rb

@@ -1,4 +1,5 @@
 require 'fulmar/domain/service/configuration_service'
+require 'colorize'
 
 module Fulmar
   module Domain
@@ -17,7 +18,7 @@ module Fulmar
           end
 
           def composer(command, arguments = [])
-            (storage['composer'] ||= Fulmar::Infrastructure::Service::ComposerService.new).execute(command, arguments)
+            (storage['composer'] ||= Fulmar::Infrastructure::Service::ComposerService.new(local_shell)).execute(command, arguments)
           end
 
           def local_shell
@@ -25,7 +26,7 @@ module Fulmar
           end
 
           def remote_shell
-            storage['remote_shell'] ||= new_shell(configuration[:remote_path], configuration[:hostname])
+            storage['remote_shell'] ||= new_shell(configuration[:remote_path], (configuration[:user] ? configuration[:user]+'@' : '')+configuration[:hostname])
           end
 
           def file_sync
@@ -61,6 +62,18 @@ module Fulmar
             @storage[configuration.environment] ||= {}
             @storage[configuration.environment][configuration.target] ||= {}
           end
+
+          def info(text)
+            puts (ENV['TERM'] == 'xterm-256color' ? text.blue : "* Info: #{text}")
+          end
+
+          def warn(text)
+            puts (ENV['TERM'] == 'xterm-256color' ? text.magenta : "* Warning: #{text}")
+          end
+
+          def error(text)
+            puts (ENV['TERM'] == 'xterm-256color' ? text.light_red : "* Error: #{text}")
+          end
         end
       end
     end

data/lib/fulmar/service/helper/database_helper.rb

@@ -2,6 +2,7 @@ module Fulmar
   module Domain
     module Service
       module Helper
+        # Provides access helper to the database service from within a task
         module DatabaseHelper
           def database
             storage['database'] ||= Fulmar::Infrastructure::Service::Database::DatabaseService.new configuration

data/lib/fulmar/service/helper/flow_helper.rb

@@ -4,6 +4,7 @@ module Fulmar
   module Domain
     module Service
       module Helper
+        # Provides access helper to the flow service from within a task
         module FlowHelper
           def flow
             storage['flow'] ||= Fulmar::Infrastructure::Service::FlowService.new remote_shell, configuration

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fulmar is a task manager for deployments.
 email:
 - j.siegl@core4.de