borg-rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM1NWU1YWYzZGJmYjE1Y2NiNWU3NjllOTU3MDgyMTdiOTA0NzFlMQ==
+    NjdkOGNhMjJlZGQwOTc2NTVhZjMzYTkwODdlMDVjZWM1M2ExYjRlZA==
   data.tar.gz: !binary |-
-    ZWVkNGIxM2VlZjE1NGU2YTI1MDNmYjM0NWJlMGExY2U3YTlmZTMxMA==
+    OWEzNzg2OGIxNDE2YjdlNTM5NjE3Zjc5ZmFiMjZmNGFhZDlmOGZlOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTFmNjM3Mjc0MmU2ZDFmOTNhNDY2NzQ3NWY3ZTQ0ODNiMDRjMzdjYjFiYWUx
-    MzBmM2I2MDkyMzI0YTQ0OTZlMGYwOWQ5ODQ3ZTdlM2Y4NjA5YzRjZmE4M2Rk
-    MDYyMmEwZjMxMDQ2YTgzZTJmZTIyNTRjZjdlZTQ1MTlkNjk3OTY=
+    Nzg3Y2QyMzhjYWZjZDQ1Zjc2ZWYyYzg1OGUxZmE2YmIwYzRiY2I5NWE4ZjJl
+    YjVkNTdkZTBiMWRkNDc2YmIxZTMzZTJlNTdjOTY4M2U2MWNhNzU1ZjQ5Yzgz
+    MTA4YmZmNDUwNTdjZWJjNjllYzMzMzUxMzVhMDk3MDQ4MDVjNGQ=
   data.tar.gz: !binary |-
-    M2E4OTY5ZmFhMzFlMTYxMjFiZWY2ZmRhNDJlMWFmNmY4NDVmOGRjYjM2ZWFh
-    Mzg2NDBmMDAyZGFlODNmOWU2YmIxOTMyYjMwNjkxYzM2ZTc0MmYwZTdjMzU4
-    ZjBjZGFhMDA4ZjQwMzVmMzA2ODJhMDE2ODc0ODQxNzNkMTRhMWM=
+    NmRlNWFlMGI5MGUwYjQ5MTJhM2I1YjQ3MGU3MDdlMDVmMDU5ZjAxODM5NjBk
+    NzRhNWViNzQ5NWRlNWIyNmMxYmU5NTA4NDE4MzExOWRlODhmNGJjMDYyODUy
+    ZjMxMDVkZjFjMjZjMjRlODQ5NzNlYTYzZDdjN2I1ZmE2NjU3NmI=

data/.gitignore

@@ -6,6 +6,7 @@ Gemfile.lock
 InstalledFiles
 coverage
 lib/bundler/man
+vender/bundle
 pkg
 rdoc
 spec/reports
@@ -14,7 +15,10 @@ test/version_tmp
 tmp
 
 # Local Ruby Dev Configs
+# Why? We aren't tied to a specific ruby version, should work on 1.9, 2.0, jruby, etc...
+# Let our travis config dictate what ruby to run our gem in.
 .rvmrc
+.ruby-version
 
 # YARD artifacts
 .yardoc

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 ## Current (Unreleased)
 
-## 0.0.2 / 3-22-2013
+## 0.0.3 / 3-22-2013
 
-* Fix load problem in Capfile in generated skeleton
+* Fix load problem in Capfile in generated skeleton (0.0.2)
+* Change load borg-rb to a require
 
 
 ## 0.0.1 / 3-21-2013

data/Capfile

@@ -1 +1 @@
-load 'lib/borg'
+require 'borg-rb'

data/README.md

@@ -36,9 +36,8 @@ my-deployer-package
 # runs on :exit events when ctrl-c is hit
 # set :borg_sigint_triggers_exit, true
 
-load 'borg'
-# load any other borg gems here.
-# NOTE: require ends up causing the initializers to be called every time a config is loaded.
+require 'borg-rb'
+# require any other borg gems here.
 
 ```
 

data/bin/borg

@@ -2,6 +2,7 @@
 
 require 'capistrano/cli'
 require 'borg/cli/applications'
+require 'borg/cli/assimilator'
 require 'borg/configuration/applications'
 require 'borg/configuration/stages'
 require 'borg/configuration/assimilator'

data/bin/borgify

@@ -10,7 +10,13 @@ if ARGV.empty? or plugin
   FileUtils.cp_r("#{skeleton_dir}/.", ".")
 
   puts "Creating lib/#{gem_name}.rb"
-  File.open("lib/#{gem_name}.rb", 'w') { |file| file.write("assimilate '#{gem_name}'") }
+  File.open("lib/#{gem_name}.rb", 'w') do |file|
+    file.write(<<-GEMRB)
+Capistrano::Configuration.instance(:must_exist).load do
+  assimilate "#{gem_name}"
+end
+    GEMRB
+  end
 
   puts "Removing unnecessary files and folders"
   if plugin

data/lib/borg/cli/assimilator.rb

@@ -0,0 +1,17 @@
+module Borg
+  module CLI
+    module Assimilator
+      def self.included(base) #:nodoc:
+        base.send :alias_method, :execute_requested_actions_without_assimilator, :execute_requested_actions
+        base.send :alias_method, :execute_requested_actions, :execute_requested_actions_with_assimilator
+      end
+
+      def execute_requested_actions_with_assimilator(config)
+        config.assimilate!
+        execute_requested_actions_without_assimilator config
+      end
+    end
+  end
+end
+
+Capistrano::CLI.send :include, Borg::CLI::Assimilator

data/lib/borg/configuration/assimilator.rb

@@ -2,11 +2,18 @@ module Borg
   module Configuration
     module Assimilator
       def assimilate gem_name
-        gem_home = Gem::Specification.find_by_name(gem_name).gem_dir
-        Dir["#{gem_home}/cap/initializers/**/*.rb"].each do |file|
-          load file
+        @to_assimilate ||= {}
+        @to_assimilate[gem_name] = Gem::Specification.find_by_name(gem_name).gem_dir
+      end
+
+      def assimilate!
+        @to_assimilate ||= {}
+        @to_assimilate.each do |gem_name, gem_home|
+          Dir["#{gem_home}/cap/initializers/**/*.rb"].each do |file|
+            load file
+          end
+          @load_paths << "#{gem_home}/cap"
         end
-        @load_paths << "#{gem_home}/cap"
       end
     end
   end

data/lib/borg/version.rb

@@ -1,3 +1,3 @@
 module Borg
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/borg-rb.rb

@@ -0,0 +1,10 @@
+# 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"
+end

data/skeleton/Capfile

@@ -4,7 +4,6 @@
 # runs on :exit events when ctrl-c is hit
 # set :borg_sigint_triggers_exit, true
 
-load "#{Gem::Specification.find_by_name('borg-rb').gem_dir}/lib/borg.rb"
+require "borg-rb"
 
-# load any other borg gems here.
-# NOTE: require ends up causing the initializers to be called every time a config is loaded.
+# require any other borg gems here.

data/spec/acceptance/borgify_plugin_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "borgify plugin" do
+  include_context "acceptance"
+
+  before do
+    assert_execute("borgify", "plugin")
+    @workdir = environment.workdir_path
+  end
+
+  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")
+    expect(gemspec.file?).to be_true
+  end
+end

data/spec/acceptance/borgify_spec.rb

@@ -1,4 +1,4 @@
-require 'acceptance_spec_helper'
+require 'spec_helper'
 
 describe "borgify" do
   include_context "acceptance"
@@ -11,39 +11,24 @@ describe "borgify" do
   it "creates the right files and directories" do
     # Gemfile
     gemfile = @workdir.join("Gemfile")
-    expect(gemfile.exist?).to be_true
-    expect(gemfile.read).to match(/^source "https:\/\/rubygems.org"$/)
-    expect(gemfile.read).to match(/borg-rb/)
+    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")
-    expect(capfile.exist?).to be_true
+    expect(capfile.file?).to be_true
 
     # lib directory
     capfile = @workdir.join("lib")
-    expect(capfile.exist?).to be_true
+    expect(capfile.directory?).to be_true
 
     # cap directory with the subdirectories: applications, initializers, recipes
     cap_dir = @workdir.join("cap")
-    expect(cap_dir.exist?).to be_true
-    expect(cap_dir.join("applications")).to be_true
-    expect(cap_dir.join("initializers")).to be_true
-    expect(cap_dir.join("recipes")).to be_true
+    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
   end
 end
-
-describe "borgify plugin" do
-  include_context "acceptance"
-
-  before do
-    assert_execute("borgify", "plugin")
-    @workdir = environment.workdir_path
-  end
-
-  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")
-    expect(gemspec.exist?).to be_true
-  end
-end

data/spec/lib/borg/configuration/assimilator_spec.rb

@@ -6,18 +6,30 @@ describe Borg::Configuration::Assimilator do
     Capistrano::Configuration.new.should respond_to :assimilate
   end
 
-  context "when assimilate('borg') is called" do
+  context "when #assimilate('borg-rb') is called" do
     subject { Capistrano::Configuration.new }
+    it "should add to the to_assimilate list" do
+      lambda {subject.assimilate('borg-rb')}.should change {subject.instance_eval("@to_assimilate")}.from(nil).to({'borg-rb' => Gem::Specification.find_by_name('borg-rb').gem_dir})
+    end
+  end
+
+  context "when #assimilate! is called" do
+    before do
+      @config = Capistrano::Configuration.new
+      @config.assimilate('borg-rb')
+    end
+
+    subject { @config }
     it "should loads all the initializers" do
       Dir["cap/initializers/**/*.rb"].each do |file|
         subject.should_receive(:load).with(File.expand_path(file))
       end
-      subject.assimilate ('borg-rb')
+      subject.assimilate!
     end
 
     it "should add the cap directory to teh load path" do
       Dir.stub("[]").and_return([])
-      lambda { subject.assimilate ('borg-rb') }.should change(subject.load_paths, :count).by 1
+      lambda { subject.assimilate! }.should change(subject.load_paths, :count).by 1
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,17 @@
 require 'capistrano/cli'
 require 'yaml'
+
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # 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'
+
+end

data/spec/support/shared_contexts/acceptance.rb

@@ -21,7 +21,6 @@ shared_context "acceptance" do
   def assert_execute(*args, &block)
     result = execute(*args, &block)
     expect(result).to succeed
-    #assert(result.exit_code == 0, "expected '#{args.join(" ")}' to succeed")
     result
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: borg-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Identified
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -118,8 +118,9 @@ files:
 - cap/initializers/performance.rb
 - cap/initializers/role_reset.rb
 - cap/initializers/sigint.rb
-- lib/borg.rb
+- lib/borg-rb.rb
 - lib/borg/cli/applications.rb
+- lib/borg/cli/assimilator.rb
 - lib/borg/configuration/applications.rb
 - lib/borg/configuration/assimilator.rb
 - lib/borg/configuration/stages.rb
@@ -131,11 +132,11 @@ files:
 - skeleton/Gemfile
 - skeleton/cap/applications/.gitkeep
 - skeleton/cap/initializers/.gitkeep
-- skeleton/cap/recipies/.gitkeep
+- skeleton/cap/recipes/.gitkeep
 - skeleton/lib/.gitkeep
 - skeleton/mygem.gemspec.skeleton
+- spec/acceptance/borgify_plugin_spec.rb
 - spec/acceptance/borgify_spec.rb
-- spec/acceptance_spec_helper.rb
 - spec/lib/borg/cli/applications_spec.rb
 - spec/lib/borg/configuration/applications_spec.rb
 - spec/lib/borg/configuration/assimilator_spec.rb
@@ -172,8 +173,8 @@ signing_key:
 specification_version: 4
 summary: Ruby-based software provisioning and deployment framework
 test_files:
+- spec/acceptance/borgify_plugin_spec.rb
 - spec/acceptance/borgify_spec.rb
-- spec/acceptance_spec_helper.rb
 - spec/lib/borg/cli/applications_spec.rb
 - spec/lib/borg/configuration/applications_spec.rb
 - spec/lib/borg/configuration/assimilator_spec.rb

data/lib/borg.rb

@@ -1,8 +0,0 @@
-# source capistrano/deploy.rb
-def _cset(name, *args, &block)
-  unless exists?(name)
-    set(name, *args, &block)
-  end
-end
-
-assimilate "borg-rb"

data/spec/acceptance_spec_helper.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # 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'
-
-end