fdlcap 0.4.2 → 0.4.3

data/Gemfile

@@ -1,14 +1,15 @@
 source "http://gemcutter.org"
 
-gem 'eycap',              '>= 0.5.1'
-gem 'auto_tagger',        '>= 0.1.0'
-gem 'capistrano',         '>= 2.5.10'
-gem 'capistrano-ext',      '>= 1.2.1'
-
-gem 'bundler',            :only => :test
-gem 'jeweler',            :only => :test
-gem 'shoulda',            :only => :test
-
-bin_path 'gbin'
-
-disable_system_gems
+group :dependency do
+  gem 'eycap', '>= 0.5.1'
+  gem 'auto_tagger', '>= 0.1.0'
+  gem 'capistrano', '>= 2.5.10'
+  gem 'capistrano-ext', '>= 1.2.1'
+end
+
+group :test do
+  gem 'rake'
+  gem 'bundler'
+  gem 'jeweler'
+  gem 'shoulda'
+end

data/Rakefile

@@ -1,7 +1,15 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'vendor', 'gems', 'environment')
-Bundler.require_env
-require 'rake'
-require 'bundler'
+begin
+  # Require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
+require "rake/testtask"
+require "rake/clean"
 
 begin
   require 'jeweler'
@@ -12,10 +20,11 @@ begin
     gem.homepage = "http://github.com/factorylabs/fdlcap"
     gem.authors = ["Factory Design Labs", "Gabe Varela", "Jay Zeschin" ]
 
-    manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+    manifest = Bundler.definition
     manifest.dependencies.each do |d|
-      next if d.only
-      gem.add_dependency(d.name, d.version)
+      next unless d.groups.include?(:dependency)
+      puts d.requirement.to_s
+      gem.add_dependency(d.name, d.requirement.to_s)
     end
 
     gem.files.exclude('.gitignore')

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/fdlcap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs", "Gabe Varela", "Jay Zeschin"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-03-01}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/factorylabs/fdlcap}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{a set of capistrano recipies we use regularly at Factory Design Labs}
   s.test_files = [
     "test/fdlcap_test.rb",

data/lib/fdlcap/recipes/fdl_defaults.rb

@@ -1,16 +1,24 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  
-  define_recipe :fdl_defaults do
+
+  define_recipe :fdl_defaults do |*args|
+
+    set :ey_environment, !args.empty? ? args.shift : true unless exists?(:ey_environment)
+
+    if ey_environment
+      # Load external eycap dependencies
+      require 'eycap/recipes'
+    end
+
     # defaults for fdl
-    set :scm,           :git
+    set :scm, :git
     set :keep_releases, 5
-    set :deploy_via,    :remote_cache
-    
+    set :deploy_via, :remote_cache
+
     use_recipe :symlinks
     use_recipe :perform_cleanup
     use_recipe :symlink_configs
     use_recipe :automigrate
-     
+
   end
-  
+
 end

data/lib/fdlcap/recipes/newrelic.rb

@@ -1,5 +1,6 @@
 Capistrano::Configuration.instance(:must_exist).load do
   define_recipe :newrelic do
+    require 'new_relic/recipes'
     # Tell Newrelic that we've deployed
     before "deploy:cleanup", "newrelic:notice_deployment"
   end

data/lib/fdlcap/recipes.rb

@@ -3,9 +3,6 @@ require 'fdlcap/extensions/configuration'
 require 'fdlcap/extensions/recipe_definition'
 require 'fdlcap/extensions/check_for_changes'
 
-# Load external fdlcap dependencies
-require 'eycap/recipes'
-
 # Load up custom recipe chunks
 Dir.glob(File.join(File.dirname(__FILE__),'recipes','*.rb')).each do |file|
   require file

data/test/test_helper.rb

@@ -1,5 +1,13 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'vendor', 'gems', 'environment')
-Bundler.require_env(:test)
+begin
+  # Require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 require 'test/unit'
 require 'shoulda'
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -11,49 +16,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -07:00
+date: 2010-03-01 00:00:00 -07:00
 default_executable: fdlcap
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eycap
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: auto_tagger
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 10
         version: 2.5.10
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: capistrano-ext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
         version: 1.2.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: interactive@factorylabs.com
 executables: 
@@ -124,18 +145,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: a set of capistrano recipies we use regularly at Factory Design Labs