fulmar 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d20b737b6af1583286258dc2f016a9e513efb35
-  data.tar.gz: 9b422f9364ec4c4ce227734bf0fb01efe5faf2ac
+  metadata.gz: b3a5a9c3fcc0eac8bf2f866acb574bc6e26b3daf
+  data.tar.gz: b37c35df4992fa35e0b98338b8306d87da6b95b2
 SHA512:
-  metadata.gz: f86764318b194d621a9259ed8b08b39bc647a3a3a7c03e9ea7721829220da70e95d2a36e3f063920890bd39e1b4a8c5a61b45c1bef3ab3a7b0d024122bb46004
-  data.tar.gz: 55a2081e314963646e7c22d4db62d4118b001f3ea6a7643c6dae3364a29fe0a72a4b050840829bfcbdb4bb5fbc5b4eb361f05bdbb971990229333e13344e0a49
+  metadata.gz: d1f91dc05ce99316148331c754ef94b195667f77d7a66736fdc335d13101b5b65e04c388252a85dee7065e46f4b88cb9f8180e317a660b9c5955a37f902e40df
+  data.tar.gz: 6d02384db532a177e53890693f17e33764be59bcec4dc19d4479cbda553dcddbc1a75798110809ad72ef0e94ebf5fe5d6708a2db8014295ab13dca50c5e0aac3

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  Include:
+    - '**/Fulmarfile'
+Metrics/LineLength:
+  Max: 120

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head
+before_install: gem install bundler -v 1.10.6
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fulmar.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'fakefs', require: 'fakefs/safe'
+end
+
+group :test, :development do
+  gem 'rubocop', require: false
+end

data/README.md

@@ -1,5 +1,7 @@
 # Fulmar
 
+[![Build Status](https://travis-ci.org/CORE4/fulmar.svg?branch=master)](https://travis-ci.org/CORE4/fulmar)
+
 Fulmar is a task manager for deployments. It is build on top of rake to use its powerful
 task system and adds host and environment configuration. It provides methods to easily
 access the current deployment configuration and simplifies especially file transfers and

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+task :default => [:spec]
+
+desc 'Run the specs'
+RSpec::Core::RakeTask.new
+
+RuboCop::RakeTask.new

data/fulmar.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
 
   spec.add_runtime_dependency 'rake', '~>10'
-  spec.add_runtime_dependency 'rugged', '~>0', '<=0.22.1'
+  spec.add_runtime_dependency 'rugged', '~> 0.23.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.1'

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

@@ -14,10 +14,18 @@ module Fulmar
           @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'
+
+            if Dir.exist? "#{data[:path]}/.git"
+              shell.run 'git fetch -q', in: data[:path]
+            else
+              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
+
+            git = Rugged::Repository.new(data[:path])
+            checkout(git, data)
           end
         end
 
@@ -26,16 +34,7 @@ module Fulmar
             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
+            checkout(git, data)
 
             # Pull
             shell = Fulmar::Infrastructure::Service::ShellService.new data[:path]
@@ -47,11 +46,30 @@ module Fulmar
 
         protected
 
-        def checkout_branch(git, branch)
+        def checkout(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])
+          elsif git.tags.map(&:name).include?(dependency[:ref])
+            git.checkout("refs/tags/#{dependency[:ref]}")
+          elsif dependency[:ref].match(/^[a-zA-Z0-9]{40}$/) && git.exists?(dependency[:ref])
+            git.checkout(dependency[:ref])
+          else
+            fail "Cannot find ref #{dependency[:ref]} in repo #{dependency[:path]}"
+          end
+        end
+
+        def checkout_branch(git, branch, remote = 'origin')
           if git.branches.collect(&:name).include? branch
             git.checkout(branch)
           else
-            new_branch = git.branches.create(branch.split('/').last, branch)
+            remote_branch = git.branches.find do |b|
+              b.name == "#{remote}/#{branch}"
+            end
+
+            new_branch = git.branches.create(branch, remote_branch.name)
+            new_branch.upstream=(remote_branch)
+
             git.checkout(new_branch)
           end
         end

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

@@ -9,14 +9,17 @@ module Fulmar
         module CommonHelper
           attr_accessor :environment
 
+          # @return [Hash]
           def full_configuration
             configuration.configuration
           end
 
+          # @return [Fulmar::Domain::Service::ConfigurationService]
           def configuration
             (@_config_service ||= Fulmar::Domain::Service::ConfigurationService.instance)
           end
 
+          # @return [Fulmar::Domain::Model::Project]
           def project
             full_configuration[:project]
           end
@@ -27,10 +30,12 @@ module Fulmar
             storage['composer'].execute(command, arguments)
           end
 
+          # @return [Fulmar::Shell]
           def local_shell
             storage['local_shell'] ||= new_shell(configuration[:local_path])
           end
 
+          # @return [Fulmar::Shell]
           def remote_shell
             storage['remote_shell'] ||= new_shell(configuration[:remote_path], configuration.ssh_user_and_host)
           end

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

@@ -7,6 +7,7 @@ module Fulmar
       class SSHConfigService
         CONFIG_FILE = "#{ENV['HOME']}/.ssh/config"
         KNOWN_HOST_FILE = "#{ENV['HOME']}/.ssh/known_hosts"
+        # @todo: Get rid of this layer (Version 2?)
         CONFIG_MAP = {
           hostname: 'Hostname',
           port: 'Port',
@@ -14,7 +15,9 @@ module Fulmar
           proxycommand: 'ProxyCommand',
           checkhostip: 'CheckHostIP',
           stricthostkeychecking: 'StrictHostKeyChecking',
-          identityfile: 'IdentityFile'
+          identityfile: 'IdentityFile',
+          userknownhostfile: 'UserKnownHostsFile',
+          loglevel: 'LogLevel'
         }
 
         def initialize(config)

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

@@ -48,6 +48,12 @@ module Fulmar
             "rsync #{rsync_command_options.join(' ')} '#{from}/' '#{to}'"
           end
 
+          # Gets the absolute release path
+          # @return [String] the release directory
+          def release_path
+            @config[:remote_path]
+          end
+
           protected
 
           # Assembles all rsync command line parameters from the configuration options

data/lib/fulmar/service/helper_service.rb

@@ -6,6 +6,7 @@ module Fulmar
         ##
         # Reverse file lookup in path
         # @param path [String]
+        # @param filename [String]
         def reverse_file_lookup(path, filename)
           paths = get_parent_directory_paths(path)
 

data/lib/fulmar/version.rb

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

data/spec/lib/fulmar/service/helper_service_spec.rb

@@ -0,0 +1,51 @@
+require 'fulmar/service/helper_service'
+
+describe Fulmar::Service::HelperService, fakefs: true do
+  BASE_PATH = '/srv/fulmar/service/helper_service_spec'
+
+  def stub_test_files(base_path)
+    4.times do |i|
+      path = ''
+
+      i.times do |n|
+        path << "/folder_d#{(n + 1)}"
+      end
+
+      FileUtils.mkdir_p("#{base_path}#{path}")
+
+      File.open("#{base_path}#{path}/file_d#{(i)}", 'w') do |f|
+        f.write 'TEST CONTENT'
+      end
+    end
+  end
+
+  before(:each) do
+    stub_test_files(BASE_PATH)
+  end
+
+  describe '#reverse_file_lookup' do
+    it 'should return the path to the file' do
+      file = described_class.reverse_file_lookup("#{BASE_PATH}/folder_d1/folder_d2/folder_d3", 'file_d1')
+      expect(file).to eq("#{BASE_PATH}/folder_d1/file_d1")
+    end
+
+    it 'should return the path to the file' do
+      file = described_class.reverse_file_lookup("#{BASE_PATH}/folder_d1/folder_d2", 'file_d2')
+      expect(file).to eq("#{BASE_PATH}/folder_d1/folder_d2/file_d2")
+    end
+
+    ##
+    # The file is located in a child directory of the given path
+    it 'should return false' do
+      file = described_class.reverse_file_lookup("#{BASE_PATH}/folder_d1/folder_d2/folder_d3", 'file_d4')
+      expect(file).to eq(false)
+    end
+
+    ##
+    # The file does not exist
+    it 'should return false' do
+      file = described_class.reverse_file_lookup("#{BASE_PATH}/folder_d1/folder_d2", 'file_d9')
+      expect(file).to eq(false)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,84 @@
+require 'fakefs/spec_helpers'
+
+Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+
+RSpec.configure do |config|
+  config.include FakeFS::SpecHelpers, fakefs: true
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,20 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +131,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - bin/fulmar
 - fulmar.gemspec
 - lib/fulmar/domain/model/project.rb
@@ -180,6 +178,8 @@ files:
 - lib/fulmar/service/logger_service.rb
 - lib/fulmar/task_manager.rb
 - lib/fulmar/version.rb
+- spec/lib/fulmar/service/helper_service_spec.rb
+- spec/spec_helper.rb
 - test/rsync_with_versions.rb
 homepage: https://github.com/CORE4/fulmar
 licenses:
@@ -206,4 +206,6 @@ signing_key:
 specification_version: 4
 summary: A deployment task manager.
 test_files:
+- spec/lib/fulmar/service/helper_service_spec.rb
+- spec/spec_helper.rb
 - test/rsync_with_versions.rb