fulmar 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 660d16ed5aaa6f6ec878db9257c72849e88ddac6
-  data.tar.gz: 825df4dcbc952670ba6d82b21599e1b95ed79bb8
+  metadata.gz: 4b922277279591ab2904e755d1ec0d1eae971c44
+  data.tar.gz: ec8ef42949ae63b41df9d43253c97334e600f682
 SHA512:
-  metadata.gz: 22f5bc04c4f38641efb9f3b62a449067db3a11bd74d2f849c54b6bf4e215976b38acb1efa7f8af4377c2c582cee883175c58e198cc42f6da6c6107dfc493c853
-  data.tar.gz: 4235c4f20d292d8a5f4fc3b397bc6c77fdf714e729de98fe6abb98b1d9e92b82fe262692fe855dfefbbe25c9e72f03028ff7d0e4cee40a09b694663a2608aa0a
+  metadata.gz: 24a25cd0574c6e1843d05add4d26c602ba52f14579fca998ef57e5dc91fb7c82c621db64961531ee6164a5daf6c3cdb24b8d612c42f97c9d9d857fc9731121bb
+  data.tar.gz: dbc9c89acd886e4453985eda896988c70bd872e2cd3683b9d89d4f3044923de71689bbdfa0e7bf3713ee5011e78739c9fe4e9ead34f0d53ae10bc30e5e409b0d

data/fulmar.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   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 'ruby_wings', '~>0.1', '>=0.1.1'
   spec.add_runtime_dependency 'colorize', '~>0'
 end

data/lib/fulmar/domain/model/project.rb

@@ -0,0 +1,18 @@
+module Fulmar
+  module Domain
+    module Model
+      # Provides information about the current project
+      class Project
+        attr_reader :name, :description, :license, :authors, :config
+
+        def initialize(config)
+          @name = config[:name] || '<unnamed>'
+          @description = config[:description] || '<no description>'
+          @license = config[:license] || 'proprietary'
+          @authors = config[:authors] || []
+          @config = config[:config] || {}
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'pp'
+require 'fulmar/domain/model/project'
 
 module Fulmar
   module Domain
@@ -59,6 +60,10 @@ module Fulmar
           @config ||= load_configuration
         end
 
+        def project
+          @project ||= Fulmar::Domain::Model::Project.new(configuration[:project])
+        end
+
         def method_missing(name)
           environment(name) if configuration[:environments][name]
         end

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

@@ -13,7 +13,11 @@ module Fulmar
           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.quiet = true
             shell.run "git clone #{data[:source]} #{data[:path]} -q"
+            shell.last_error.each do |line|
+              puts line unless line.include? 'already exists and is not an empty directory'
+            end
           end
         end
 

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

@@ -60,6 +60,10 @@ module Fulmar
             shell
           end
 
+          def ssh_config
+            storage['ssh_config'] ||= Fulmar::Infrastructure::Service::SSHConfigService.new configuration
+          end
+
           def storage
             fail 'You need to set an environment and a target first' unless configuration.ready?
             @storage ||= {}

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

@@ -0,0 +1,77 @@
+require 'fulmar/shell'
+
+module Fulmar
+  module Infrastructure
+    module Service
+      # Adds entries to the ssh config and checks for existing ones
+      class SSHConfigService
+        CONFIG_FILE = "#{ENV['HOME']}/.ssh/config"
+        KNOWN_HOST_FILE = "#{ENV['HOME']}/.ssh/known_hosts"
+
+        def initialize(config)
+          @config = config
+        end
+
+        def add_hosts
+          @config.configuration[:hosts].values.each do |data|
+            unless config_valid?(data)
+              puts "Skipping #{data[:hostname]}, config not sufficient." if @config[:debug]
+              next
+            end
+            if host_exists?(data[:hostname])
+              puts "Host #{data[:hostname]} exists, skipping..." if @config[:debug]
+            else
+              add_host(data[:hostname], data)
+            end
+          end
+        end
+
+        def remove_known_host(hostname)
+          input_file = File.open(KNOWN_HOST_FILE, 'r')
+          output_file = File.open(KNOWN_HOST_FILE + '.temp', 'w')
+          while (line = input_file.gets)
+            output_file.puts(line) unless /^\[?#{hostname.gsub('.', '\\.')}(?:\]:\d+)? /.match(line)
+          end
+          input_file.close
+          output_file.close
+          FileUtils.mv(KNOWN_HOST_FILE + '.temp', KNOWN_HOST_FILE)
+        end
+
+        # Parses the users ssh config for an existing hostname
+        def host_exists?(hostname)
+          config_file = File.open(CONFIG_FILE, 'r')
+          while (line = config_file.gets)
+            if /\s*Host #{hostname.gsub('.', '\\.')}\s*$/.match(line)
+              config_file.close
+              return true
+            end
+          end
+          config_file.close
+          false
+        end
+
+        # Adds a host to the ssh config file
+        def add_host(hostname, host_config = {})
+          puts "Adding host #{host_config[:hostname]}..." if @config[:debug]
+          config_file = File.open(CONFIG_FILE, 'a')
+
+          config_file.puts "\n" # Add some space between this and the second last entry
+          config_file.puts "# Automatically generated by fulmar for project #{@config.project.description}"
+          config_file.puts "Host #{hostname}"
+          config_file.puts "    Hostname #{host_config[:config_hostname]}" unless host_config[:config_hostname].blank?
+          config_file.puts "    Port #{host_config[:config_port]}" unless host_config[:config_port].blank?
+          config_file.puts "    User #{host_config[:config_user]}" unless host_config[:config_user].blank?
+          config_file.puts "    ProxyCommand #{host_config[:config_proxycommand]}" unless host_config[:config_proxycommand].blank?
+
+          config_file.close
+        end
+
+        private
+
+        def config_valid?(host_config)
+          (!host_config[:hostname].blank? && !host_config[:config_hostname].blank?)
+        end
+      end
+    end
+  end
+end

data/lib/fulmar/task_manager.rb

@@ -14,6 +14,7 @@ require 'fulmar/infrastructure/service/composer_service'
 require 'fulmar/infrastructure/service/shell_service'
 require 'fulmar/infrastructure/service/git_service'
 require 'fulmar/infrastructure/service/copy_service'
+require 'fulmar/infrastructure/service/ssh_config_service'
 
 require 'fulmar/infrastructure/service/database/database_service'
 

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - README.md
 - bin/fulmar
 - fulmar.gemspec
+- lib/fulmar/domain/model/project.rb
 - lib/fulmar/domain/service/application_service.rb
 - lib/fulmar/domain/service/config_rendering_service.rb
 - lib/fulmar/domain/service/config_test_service.rb
@@ -162,6 +163,7 @@ files:
 - lib/fulmar/infrastructure/service/flow_service.rb
 - lib/fulmar/infrastructure/service/git_service.rb
 - lib/fulmar/infrastructure/service/shell_service.rb
+- lib/fulmar/infrastructure/service/ssh_config_service.rb
 - lib/fulmar/infrastructure/service/transfer/base.rb
 - lib/fulmar/infrastructure/service/transfer/rsync.rb
 - lib/fulmar/infrastructure/service/transfer/rsync_with_versions.rb