borg-rb 0.0.5 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU2Mzc2MGFjZTM4Nzg3M2FhNGM5NTQwMjNhMTkwNTI2MGMxM2VlOA==
+    YjQ4NTU4YjI0N2JiZDRlZjdlYTAwOTY5NDU3MGQxOGM3YjE2OGNjNA==
   data.tar.gz: !binary |-
-    NTk4NGZjNzEyOWJhZGM2MDUyYzMxOWRhMGNiODZiODFhZGY0NDdlYw==
+    MmYzNTQ1N2FkYjViYzNlZjAyM2Q2ODY5MzYyNzI0OTk5NWFjMWI5Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2Q1MzlmMmIwNjFlZDYzZDQwYjZjYTdmYWNkMTFhMGM3OWY3YWE5MTFhY2Rh
-    ZDQ3MDZmNTlmZjNhYjE5OWMwODcxNDJmOGRmNGJmMDJmYjEzMDMxMjMxYzZi
-    MWRhMzdjZGMzNzhhMmYzYWY0ZTljYWViYTEzODBmYjBiNTQzODA=
+    NGJjOWIwNWE3ZGJlM2NiMTM5MTE2N2QxYzgyNTAxZTQ5MGRmZTc5ZjVkMWYz
+    MGY0NjE4NmE0MTM2MDAyZTYyN2Y2MjZkYjEwZWVkODE2N2M4Yjk2YzA5NTli
+    NzAxNjJkMGQzY2RkOWYxYmIwODc4YTQwNmJjNmRiMzU4NGUwMjE=
   data.tar.gz: !binary |-
-    MDE3ZjBmYTVmNTFmYTY0ZTZjMzJkNzIxOTJlNjQ5NTU1YjMyNjRiNzJlMGU1
-    YzQ2M2FhN2IyZjgyOWZiMGViM2RmMzQ2ZGNlZDBmMGE3YjMwMGI3ZDM3ZTQz
-    NzQxOTExZmUyNmFmNzRjZjhiNWU2OWI1ZTQ2N2I5OTM0MzJhZWY=
+    MDcxNmIxMTE4ODBiNDYyYzQ2YTQ3YTI4MmJmMzY1YjJkZDE5MzZmZmFiNDg2
+    ZDU3YTkzN2FmNzZkODY2YjQxZmY4OTJhOWU5ODIwYjM0NTcyMTI2YTQyMDYw
+    ZTQwOGU5MGIxNjc3YTE4ZDdiYTZmNTczMzNjNjYxMjEwMDM1MmQ=

data/CHANGELOG.md

@@ -1,14 +1,4 @@
 ## HEAD
 
-## 0.0.5 / 3-27-2013
-* Allow stage definitions with empty blocks
-* Allow access to `application` and `stage` in an application configuration by creating a capistrano variable for them (0.0.4)
-* Change load borg-rb to a require (0.0.3)
-* Fix load problem in Capfile in generated skeleton (0.0.2)
-
-
-
-## 0.0.1 / 3-21-2013
-
-* Created initial project skeleton: application config, multi-stage app config
-* Created initial plugin skeleton for adding recipes
+## 0.1.0 / 4-1-2013
+Initial Release

data/bin/borg

@@ -1,18 +1,3 @@
 #!/usr/bin/env ruby
-
-require 'capistrano/cli'
-require 'borg/cli/applications'
-require 'borg/cli/assimilator'
-require 'borg/configuration/applications'
-require 'borg/configuration/stages'
-require 'borg/configuration/assimilator'
-require 'erb'
-
-require 'borg/errors'
-require 'borg/server/base'
-require 'borg/servers/base'
-
-# Ensure ruby 1.9.X
-raise "Ruby 1.9.X required" unless RUBY_VERSION =~ /^1\.9\.\d$/ || RUBY_VERSION =~ /^2\.0\.\d$/
-
-Capistrano::CLI.execute
+require 'borg'
+Borg::CLI.execute

data/borg.gemspec

@@ -4,26 +4,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'borg/version'
 
 Gem::Specification.new do |s|
-  s.name        = "borg-rb"
+  s.name        = 'borg-rb'
   s.version     = Borg::VERSION
-  s.authors     = ["Identified"]
-  s.email       = ["phil@identified.com", "tejas@identified.com"]
+  s.authors     = %w(Identified)
+  s.email       = %w(phil@identified.com tejas@identified.com)
   s.description   = %q{Ruby-based software provisioning and deployment framework}
   s.summary       = %q{Ruby-based software provisioning and deployment framework}
-  s.homepage      = "https://github.com/B0RG/borg"
-  s.license       = "MIT"
+  s.homepage      = 'https://github.com/B0RG/borg'
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = %w(lib)
 
-  s.add_dependency "capistrano", "~> 2.14.2"
-  s.add_dependency "capistrano_colors"
-  s.add_dependency "colored"
-  s.add_dependency "term-ansicolor"
+  s.required_ruby_version = '>= 1.9.2'
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "childprocess"
+  s.add_dependency 'capistrano', '~> 2.14.2'
+  s.add_dependency 'capistrano_colors'
+  s.add_dependency 'colored'
+  s.add_dependency 'term-ansicolor'
 
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'childprocess'
 end

data/cap/initializers/performance.rb

@@ -1,5 +1,4 @@
-_cset :borg_performance_reports, true
-if borg_performance_reports
+if fetch(:borg_performance_reports, true)
   # source: https://github.com/PagerDuty/pd-cap-recipes/blob/master/lib/pd-cap-recipes/tasks/performance.rb
   start_times = {}
   end_times = {}
@@ -24,19 +23,19 @@ if borg_performance_reports
       logger.info s
     end
 
-    l " Performance Report"
-    l "=========================================================="
+    l ' Performance Report'
+    l '=========================================================='
     indent = 0
     (order + [nil]).each_cons(2) do |payload1, payload2|
       action, task = payload1
       if action == :start
-        l "#{".." * indent}#{task.fully_qualified_name}" unless task == payload2.last
+        l "#{'..' * indent}#{task.fully_qualified_name}" unless task == payload2.last
         indent += 1
       else
         indent -= 1
-        l "#{".." * indent}#{task.fully_qualified_name} #{(end_times[task] - start_times[task]).to_i}s"
+        l "#{'..' * indent}#{task.fully_qualified_name} #{(end_times[task] - start_times[task]).to_i}s"
       end
     end
-    l "=========================================================="
+    l '=========================================================='
   end
 end

data/cap/initializers/role_reset.rb

@@ -8,5 +8,5 @@ module ::Capistrano
   end
 end
 
-desc "Resets all dynamic capistrano roles."
+desc 'Resets all dynamic capistrano roles.'
 task(:reset_roles) { roles.each {|k,v| v.reset!} }

data/cap/initializers/sigint.rb

@@ -1,8 +1,6 @@
-_cset :borg_sigint_triggers_exit, true
-
-if borg_sigint_triggers_exit
+if fetch(:borg_sigint_triggers_exit, true)
   __cap = Capistrano::Configuration.instance
-  ::Signal.trap "SIGINT" do
+  ::Signal.trap 'SIGINT' do
     __cap.trigger :exit
     exit 1
   end

data/lib/borg-rb.rb

@@ -1,10 +1,3 @@
-# source capistrano/deploy.rb
-Capistrano::Configuration.instance(:must_exist).load do
-  def _cset(name, *args, &block)
-    unless exists?(name)
-      set(name, *args, &block)
-    end
-  end
-
-  assimilate "borg-rb"
+Borg::Configuration.instance(:must_exist).load do
+  assimilate 'borg-rb'
 end

data/lib/borg.rb

@@ -0,0 +1,15 @@
+# Ensure ruby 1.9.X
+raise 'Ruby 1.9.x or 2.0.x required' unless RUBY_VERSION =~ /^1\.9\.\d$/ || RUBY_VERSION =~ /^2\.0\.\d$/
+
+# Colors
+require 'capistrano_colors'
+require 'colored'
+require 'term/ansicolor'
+
+require 'borg/cli'
+require 'borg/configuration'
+require 'borg/errors'
+require 'borg/server/base'
+require 'borg/servers/base'
+
+require 'erb'

data/lib/borg/cli.rb

@@ -0,0 +1,28 @@
+require 'capistrano/cli'
+require 'borg/cli/applications'
+require 'borg/cli/assimilator'
+require 'borg/configuration'
+require 'borg/errors'
+
+module Borg
+  class CLI < Capistrano::CLI
+    # override method in Capistrano::CLI::Execute
+    def instantiate_configuration(options = {}) #:nodoc:
+      Borg::Configuration.new(options)
+    end
+
+    # override method in Capistrano::CLI::Execute
+    def handle_error(error) #:nodoc:
+      case error
+        when Net::SSH::AuthenticationFailed
+          abort "authentication failed for `#{error.message}'"
+        when Borg::BaseError
+          abort(error.message)
+        else raise error
+      end
+    end
+
+    # Mix-in our own behavior
+    include Applications, Assimilator
+  end
+end

data/lib/borg/cli/applications.rb

@@ -1,5 +1,5 @@
 module Borg
-  module CLI
+  class CLI < Capistrano::CLI
     module Applications
       def self.included(base) #:nodoc:
         base.send :alias_method, :execute_requested_actions_without_applications, :execute_requested_actions
@@ -26,7 +26,7 @@ module Borg
 
       def load_applications(config)
         unless @apps_loaded
-          Dir["./cap/applications/**/*.rb"].each { |file| config.load(file) }
+          Dir['./cap/applications/**/*.rb'].each { |file| config.load(file) }
           @apps_loaded = true
         end
       end
@@ -35,7 +35,7 @@ module Borg
         options[:applications] = []
         found_non_application = false
         options[:actions] = Array(options[:actions]).keep_if do |action|
-          app, stg = action.split(":").map(&:to_sym)
+          app, stg = action.split(':').map(&:to_sym)
           ret = if config.applications[app] and config.applications[app].stages[stg]
             options[:applications] << config.applications[app].stages[stg]
             false
@@ -50,12 +50,10 @@ module Borg
             found_non_application = true
             true
           end
-          raise ArgumentError, "Can not have non application configs between application configs" if !ret and found_non_application
+          raise ArgumentError, 'Can not have non application configs between application configs' if !ret and found_non_application
           ret
         end
       end
     end
   end
 end
-
-Capistrano::CLI.send(:include, Borg::CLI::Applications)

data/lib/borg/cli/assimilator.rb

@@ -1,5 +1,5 @@
 module Borg
-  module CLI
+  class CLI < Capistrano::CLI
     module Assimilator
       def self.included(base) #:nodoc:
         base.send :alias_method, :execute_requested_actions_without_assimilator, :execute_requested_actions
@@ -13,5 +13,3 @@ module Borg
     end
   end
 end
-
-Capistrano::CLI.send :include, Borg::CLI::Assimilator

data/lib/borg/configuration.rb

@@ -0,0 +1,17 @@
+require 'capistrano/configuration'
+require 'borg/configuration/applications'
+require 'borg/configuration/assimilator'
+require 'borg/configuration/stages'
+
+module Borg
+  class Configuration < Capistrano::Configuration
+    # Mix-in our own behavior
+    include Applications, Assimilator, Stages
+
+    # source: capistrano/recipes/deploy.rb
+    def _cset(name, *args, &block)
+      set(name, *args, &block) unless exists?(name)
+    end
+
+  end
+end

data/lib/borg/configuration/applications.rb

@@ -1,7 +1,6 @@
 module Borg
-  module Configuration
+  class Configuration < Capistrano::Configuration
     module Applications
-
       def self.included(base) #:nodoc:
         base.send :alias_method, :initialize_without_applications, :initialize
         base.send :alias_method, :initialize, :initialize_with_applications
@@ -14,7 +13,7 @@ module Borg
       end
       private :initialize_with_applications
 
-      def application (name, &block)
+      def application(name, &block)
         name = name.to_sym
         namespace name do
           desc "Load Application #{name} (All Stages if any)"
@@ -31,14 +30,14 @@ module Borg
         attr_accessor :stages
         attr_reader   :name
 
-        def initialize name, namespace
+        def initialize(name, namespace)
           @execution_blocks = []
           @name = name
           @namespace = namespace
           @stages = {}
         end
 
-        def load_into config
+        def load_into(config)
           if config.respond_to?(:application)
             # Undefine the stage method now that the app:stage config is created
             config_metaclass = class << config; self; end
@@ -47,11 +46,9 @@ module Borg
             # Create a capistrano variable for stage
             config.instance_exec(@name, &(lambda { |name| set :application, name }))
           end
-          @execution_blocks.each {|blk| config.load &blk}
+          @execution_blocks.each { |blk| config.load &blk }
         end
       end
     end
   end
 end
-
-Capistrano::Configuration.send :include, Borg::Configuration::Applications

data/lib/borg/configuration/assimilator.rb

@@ -1,21 +1,20 @@
 module Borg
-  module Configuration
+  class Configuration < Capistrano::Configuration
     module Assimilator
-      def assimilate gem_name
+      def assimilate(borg_plugin, plugin_path = nil)
         @to_assimilate ||= {}
-        @to_assimilate[gem_name] = Gem::Specification.find_by_name(gem_name).gem_dir
+        @to_assimilate[borg_plugin] = plugin_path || Gem::Specification.find_by_name(borg_plugin).gem_dir
       end
 
       def assimilate!
         @to_assimilate ||= {}
-        @to_assimilate.each do |gem_name, gem_home|
-          Dir["#{gem_home}/cap/initializers/**/*.rb"].each do |file|
+        @to_assimilate.each do |borg_plugin, plugin_path|
+          Dir["#{plugin_path}/cap/initializers/**/*.rb"].each do |file|
             load file
           end
-          @load_paths << "#{gem_home}/cap"
+          @load_paths << "#{plugin_path}/cap"
         end
       end
     end
   end
 end
-Capistrano::Configuration.send :include, Borg::Configuration::Assimilator

data/lib/borg/configuration/stages.rb

@@ -1,5 +1,5 @@
 module Borg
-  module Configuration
+  class Configuration < Capistrano::Configuration
     module Stages
       def stage(app, name, &block)
         app = app.to_sym
@@ -48,5 +48,3 @@ module Borg
     end
   end
 end
-
-Capistrano::Configuration.send(:include, Borg::Configuration::Stages)

data/lib/borg/version.rb

@@ -1,3 +1,3 @@
 module Borg
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/spec/acceptance/borgify_plugin_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe "borgify plugin" do
-  include_context "acceptance"
+describe 'borgify plugin' do
+  include_context 'acceptance'
 
   before do
-    assert_execute("borgify", "plugin")
+    assert_execute('borgify', 'plugin')
     @workdir = environment.workdir_path
   end
 
-  it "creates the right files and directories" do
+  it 'creates the right files and directories' do
     # the gemspec
     directory_name = File.basename(@workdir = environment.workdir_path)
     gemspec = @workdir = environment.workdir_path.join("#{directory_name}.gemspec")

data/spec/acceptance/borgify_spec.rb

@@ -1,34 +1,34 @@
 require 'spec_helper'
 
-describe "borgify" do
-  include_context "acceptance"
+describe 'borgify' do
+  include_context 'acceptance'
 
   before do
-    assert_execute("borgify")
+    assert_execute('borgify')
     @workdir = environment.workdir_path
   end
 
-  it "creates the right files and directories" do
+  it 'creates the right files and directories' do
     # Gemfile
-    gemfile = @workdir.join("Gemfile")
+    gemfile = @workdir.join('Gemfile')
     expect(gemfile.file?).to be_true
     gemfile_contents = gemfile.read
     expect(gemfile_contents).to match(/^source "https:\/\/rubygems.org"$/)
     expect(gemfile_contents).to match(/borg-rb/)
 
     # Capfile
-    capfile = @workdir.join("Capfile")
+    capfile = @workdir.join('Capfile')
     expect(capfile.file?).to be_true
 
     # lib directory
-    capfile = @workdir.join("lib")
+    capfile = @workdir.join('lib')
     expect(capfile.directory?).to be_true
 
     # cap directory with the subdirectories: applications, initializers, recipes
-    cap_dir = @workdir.join("cap")
+    cap_dir = @workdir.join('cap')
     expect(cap_dir.directory?).to be_true
-    expect(cap_dir.join("applications").directory?).to be_true
-    expect(cap_dir.join("initializers").directory?).to be_true
-    expect(cap_dir.join("recipes").directory?).to be_true
+    expect(cap_dir.join('applications').directory?).to be_true
+    expect(cap_dir.join('initializers').directory?).to be_true
+    expect(cap_dir.join('recipes').directory?).to be_true
   end
 end