fulmar 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b677f5683a979d761f27915ec1181cf120f9e57
-  data.tar.gz: 4af0a8618226dd09f4deda014c8fa0151e1d4841
+  metadata.gz: 868b4a631f7d6353d760308daccd0457903b21fc
+  data.tar.gz: 5059427443e582732688fe6d0c722d50bd395058
 SHA512:
-  metadata.gz: 2037bd7be61b50fea042250a59b639c8dc85876039dd9bb3ade4804f9d128ee7d4b5eedf774a4308184270af5972cbe053245d3c6eeeb2feb826e406478dbbde
-  data.tar.gz: aa06a04c726ae5f7588bc0b655639af26f78eac65afd74800167840483efd8b17d94396b114eaf66b8302cd1faea24a330dada3957e3fdc773718e7450b31a87
+  metadata.gz: eb09328c8bc4ba396c967329787a21a8d0fb7cd5fd8080636c6d105b3edb4902d7358a597c0e5e98d058c0288011c084db6c4b698fcbeb726305954790fbb00f
+  data.tar.gz: caa5e4392cc720b383e14029e378b01b808181e07e5fe09d5af0cf98d250538f205508ebc72c178d81e91696bdb0637ebc79e87f1b6704287f093827e4dc5749

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

@@ -30,12 +30,12 @@ module Fulmar
         end
 
         def wrap_environment
-          proc do
+          proc do |t, args|
             configuration = Fulmar::Domain::Service::ConfigurationService.instance
             environment = configuration.environment
             target = configuration.target
 
-            yield if block_given?
+            yield(t, args) if block_given?
 
             configuration.environment = environment unless environment.nil?
             configuration.target = target unless target.nil?

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

@@ -67,6 +67,10 @@ module Fulmar
           @target = target ? target.to_sym : nil
         end
 
+        def ssh_user_and_host
+          self[:user].blank? ? self[:hostname] : self[:user] + '@' + self[:hostname]
+        end
+
         def dependencies(env = nil)
           env.nil? ? @config[:dependencies][:all] : @config[:dependencies][:all].deep_merge(@config[:dependencies][env])
         end

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

@@ -0,0 +1,57 @@
+require 'rugged'
+
+module Fulmar
+  module Domain
+    module Service
+      # Manages dependencies to subrepositories
+      class DependencyService
+        def initialize(config)
+          @config = config
+        end
+
+        def setup(env = @config.environment)
+          shell = Fulmar::Infrastructure::Service::ShellService.new(@config[:local_path])
+          @config.dependencies(env).each_pair do |_key, data|
+            next unless data[:type].blank? || data[:type] == 'git'
+            shell.run "git clone #{data[:source]} #{data[:path]}"
+          end
+        end
+
+        def update(env = @config.environment)
+          @config.dependencies(env).each_pair do |_key, data|
+            next unless data[:type].blank? || data[:type] == 'git'
+            git = Rugged::Repository.new(data[:path])
+
+            # Switch to the configured branch/tag/commit
+            if git.branches.select { |b| b.name.split('/').last == data[:ref] }.any?
+              checkout_branch(git, data[:ref])
+            elsif git.tags.map(&:name).include?(data[:ref])
+              git.checkout('refs/tags/'+data[:ref])
+            elsif data[:ref].match(/^[a-zA-Z0-9]{40}$/) && git.exists?(data[:ref])
+              git.checkout(data[:ref])
+            else
+              fail "Cannot find ref #{data[:ref]} in repo #{data[:path]}"
+            end
+
+            # Pull
+            shell = Fulmar::Infrastructure::Service::ShellService.new @config[:local_path]+'/'+data[:path]
+            unless shell.run 'git pull --rebase -q'
+              fail "Cannot update repository #{data[:path]}. Please update manually."
+            end
+          end
+        end
+
+        protected
+
+        def checkout_branch(git, branch)
+          if git.branches.collect(&:name).include? branch
+            git.checkout(branch)
+          else
+            new_branch = git.branches.create(branch.split('/').last, branch)
+            git.checkout(new_branch)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,3 +9,8 @@ if configuration.feature? :flow
   require 'fulmar/service/helper/flow_helper'
   include Fulmar::Domain::Service::Helper::FlowHelper
 end
+
+if full_configuration[:dependencies].any?
+  require 'fulmar/service/helper/dependencies_helper'
+  include Fulmar::Domain::Service::Helper::DependenciesHelper
+end

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

@@ -0,0 +1,55 @@
+if configuration.any? { |data| data[:type] == 'vhost' }
+  namespace :vhost do
+    configuration.each do |env, target, data|
+      next if data[:type] != 'vhost'
+
+      desc "Create a vhost for #{env}"
+      task :create do
+        configuration.environment = env
+        configuration.target      = target
+        branch = git.current_branch
+        match = branch.match(/f\d+_([a-zA-Z0-9]+)/)
+        unless match
+          STDERR.puts "Cannot deploy branch '#{branch}'"
+          return
+        end
+        configuration[:branch_name] = branch
+        configuration[:vhost_name] = match[1]
+        render_templates
+        upload configuration[:vhost_template]
+        sites_enabled_dir = configuration[:sites_enabled_dir] || '../sites_enabled'
+        remote_shell.run [
+                           "ln -s #{configuration[:vhost_template]} #{sites_enabled_dir}/#{configuration[:vhost_template]}",
+                           "service #{configuration[:webserver] || 'nginx'} reload"
+                         ]
+      end
+
+      desc "List existing vhosts for #{env}"
+      task :list do
+        configuration.environment = env
+        configuration.target      = target
+
+        remote_shell.run 'ls -1'
+        remote_shell.last_output.each do |line|
+          match = line.match(/auto_vhost_(.*)\.conf/)
+          if match
+            name = match[1]
+            puts "- #{name}, delete via 'fulmar vhost:delete[#{name}]'"
+          end
+        end
+      end
+
+      desc "Delete a vhost for #{env}"
+      task :delete, [:name] do |_t, argv|
+        configuration.environment = env
+        configuration.target      = target
+
+        remote_shell.run [
+                           "rm auto_vhost_#{argv[:name]}.conf",
+                           "service #{configuration[:webserver] || 'nginx'} reload"
+                         ]
+      end
+    end
+  end
+
+end

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

@@ -3,12 +3,15 @@ module Fulmar
     module Service
       # Provides access to composer
       class ComposerService
+        DEFAULT_PARAMS = ['--no-dev']
+
         def initialize(shell, custom_path = '/usr/bin/env composer')
           @local_shell = shell
+          @local_shell.quiet = true
           @path = custom_path
         end
 
-        def execute(command, arguments = %w(--no-dev -q))
+        def execute(command, arguments = DEFAULT_PARAMS)
           @local_shell.run "#{@path} #{command} #{arguments.join(' ')}"
         end
       end

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

@@ -45,12 +45,6 @@ module Fulmar
             # Placeholder for consistent api, currently only implemented in rsync_with_versions
             true
           end
-
-          protected
-
-          def ssh_user_and_host
-            @config[:user].blank? ? @config[:hostname] : @config[:user] + '@' + @config[:hostname]
-          end
         end
       end
     end

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

@@ -37,9 +37,9 @@ module Fulmar
           def rsync_command
             if @config[:rsync][:direction] == 'up'
               from = @config[:local_path]
-              to = ssh_user_and_host + ':' + @config[:remote_path]
+              to = @config.ssh_user_and_host + ':' + @config[:remote_path]
             else
-              from = ssh_user_and_host + ':' + @config[:remote_path]
+              from = @config.ssh_user_and_host + ':' + @config[:remote_path]
               to = @config[:local_path]
             end
 

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

@@ -45,7 +45,7 @@ module Fulmar
           # Ensures all needed services are set up
           def prepare
             super
-            @remote_shell = Fulmar::Infrastructure::Service::ShellService.new @config[:remote_path], ssh_user_and_host
+            @remote_shell = Fulmar::Infrastructure::Service::ShellService.new @config[:remote_path], @config.ssh_user_and_host
             @remote_shell.debug = @config[:debug]
           end
 
@@ -143,7 +143,7 @@ module Fulmar
             options << "--chmod='#{@config[:rsync][:chmod]}'" if @config[:rsync][:chmod]
             options << '--delete' if @config[:rsync][:delete]
 
-            "rsync #{options.join(' ')} '#{@config[:local_path]}/' '#{ssh_user_and_host}:#{@config[:remote_path]}/#{@config[:temp_dir]}'"
+            "rsync #{options.join(' ')} '#{@config[:local_path]}/' '#{@config.ssh_user_and_host}:#{@config[:remote_path]}/#{@config[:temp_dir]}'"
           end
 
           # Copies the data from the sync temp to the actual release directory

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

@@ -17,7 +17,7 @@ module Fulmar
             (@_config_service ||= Fulmar::Domain::Service::ConfigurationService.instance)
           end
 
-          def composer(command, arguments = [])
+          def composer(command, arguments = Fulmar::Infrastructure::Service::ComposerService::DEFAULT_PARAMS)
             (storage['composer'] ||= Fulmar::Infrastructure::Service::ComposerService.new(local_shell)).execute(command, arguments)
           end
 
@@ -42,11 +42,11 @@ module Fulmar
           end
 
           def upload(filename)
-            Fulmar::Infrastructure::Service::CopyService.upload(local_shell, filename, configuration[:hostname], configuration[:remote_path])
+            Fulmar::Infrastructure::Service::CopyService.upload(local_shell, filename, configuration.ssh_user_and_host, configuration[:remote_path])
           end
 
           def download(filename)
-            Fulmar::Infrastructure::Service::CopyService.download(local_shell, configuration[:hostname], filename, configuration[:local_path])
+            Fulmar::Infrastructure::Service::CopyService.download(local_shell, configuration.ssh_user_and_host, filename, configuration[:local_path])
           end
 
           def new_shell(path, hostname = 'localhost')
@@ -64,15 +64,15 @@ module Fulmar
           end
 
           def info(text)
-            puts (ENV['TERM'] == 'xterm-256color' ? text.blue : "* Info: #{text}")
+            puts (ENV['TERM'] == 'xterm-256color' ? text.blue : "* Info: #{text}") if verbose
           end
 
           def warn(text)
-            puts (ENV['TERM'] == 'xterm-256color' ? text.magenta : "* Warning: #{text}")
+            STDERR.puts (ENV['TERM'] == 'xterm-256color' ? text.magenta : "* Warning: #{text}")
           end
 
           def error(text)
-            puts (ENV['TERM'] == 'xterm-256color' ? text.light_red : "* Error: #{text}")
+            STDERR.puts (ENV['TERM'] == 'xterm-256color' ? text.light_red : "* Error: #{text}")
           end
         end
       end

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

@@ -0,0 +1,16 @@
+require 'fulmar/domain/service/dependency_service'
+
+module Fulmar
+  module Domain
+    module Service
+      module Helper
+        # Provides access helper to the database service from within a task
+        module DependenciesHelper
+          def dependencies
+            storage['dependecies'] ||= Fulmar::Domain::Service::DependencyService.new configuration
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,12 +140,14 @@ files:
 - lib/fulmar/domain/service/application_service.rb
 - lib/fulmar/domain/service/config_rendering_service.rb
 - lib/fulmar/domain/service/configuration_service.rb
+- lib/fulmar/domain/service/dependency_service.rb
 - lib/fulmar/domain/service/file_sync_service.rb
 - lib/fulmar/domain/service/initialization_service.rb
 - lib/fulmar/domain/task/base.rake
 - lib/fulmar/domain/task/database_sync.rake
 - lib/fulmar/domain/task/environment.rake
 - lib/fulmar/domain/task/versions.rake
+- lib/fulmar/domain/task/vhost.rake
 - lib/fulmar/infrastructure/service/composer_service.rb
 - lib/fulmar/infrastructure/service/copy_service.rb
 - lib/fulmar/infrastructure/service/database/database_service.rb
@@ -160,6 +162,7 @@ files:
 - lib/fulmar/service/bootstrap_service.rb
 - lib/fulmar/service/helper/common_helper.rb
 - lib/fulmar/service/helper/database_helper.rb
+- lib/fulmar/service/helper/dependencies_helper.rb
 - lib/fulmar/service/helper/flow_helper.rb
 - lib/fulmar/service/helper_service.rb
 - lib/fulmar/service/logger_service.rb