Fixing rakefile, console, freezing a_b_plugin

winton · Jul 13, 2010 · 17b62f3 · 17b62f3
1 parent 8f83653
commit 17b62f3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 75 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,83 +3,46 @@ GEM
   specs:
     actionmailer (2.3.5)
       actionpack (= 2.3.5)
-    actionmailer (2.3.5)
-      actionpack (= 2.3.5)
-    actionpack (2.3.5)
-      activesupport (= 2.3.5)
-      rack (~> 1.0.0)
     actionpack (2.3.5)
       activesupport (= 2.3.5)
       rack (~> 1.0.0)
     active_wrapper (0.2.7)
       actionmailer (= 2.3.5)
       activerecord (= 2.3.5)
-    active_wrapper (0.2.7)
-      actionmailer (= 2.3.5)
-      activerecord (= 2.3.5)
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
     activerecord (2.3.5)
       activesupport (= 2.3.5)
     activesupport (2.3.5)
-    activesupport (2.3.5)
-    builder (2.1.2)
     builder (2.1.2)
+    crack (0.1.6)
     cucumber (0.6.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       json_pure (>= 1.2.0)
       polyglot (>= 0.2.9)
       term-ansicolor (>= 1.0.4)
       treetop (>= 1.4.2)
-    cucumber (0.6.2)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      json_pure (>= 1.2.0)
-      polyglot (>= 0.2.9)
-      term-ansicolor (>= 1.0.4)
-      treetop (>= 1.4.2)
-    diff-lcs (1.1.2)
     diff-lcs (1.1.2)
     haml (2.2.17)
-    haml (2.2.17)
-    json_pure (1.2.0)
+    httparty (0.5.2)
+      crack (= 0.1.6)
     json_pure (1.2.0)
     lilypad (0.3.0)
       builder (>= 2.1.2)
-    lilypad (0.3.0)
-      builder (>= 2.1.2)
-    mysql (2.8.1)
     mysql (2.8.1)
     newrelic_rpm (2.10.6)
-    newrelic_rpm (2.10.6)
-    polyglot (0.2.9)
     polyglot (0.2.9)
     rack (1.0.1)
-    rack (1.0.1)
-    rack-flash (0.1.1)
-      rack
     rack-flash (0.1.1)
       rack
     rack-test (0.5.3)
       rack (>= 1.0)
-    rack-test (0.5.3)
-      rack (>= 1.0)
-    rake (0.8.7)
     rake (0.8.7)
     rspec (1.3.0)
-    rspec (1.3.0)
-    sinatra (1.0)
-      rack (>= 1.0)
     sinatra (1.0)
       rack (>= 1.0)
     term-ansicolor (1.0.4)
-    term-ansicolor (1.0.4)
     treetop (1.4.3)
       polyglot (>= 0.2.5)
-    treetop (1.4.3)
-      polyglot (>= 0.2.5)
-    with_pid (0.1.2)
     with_pid (0.1.2)
 
 PLATFORMS
@@ -90,10 +53,11 @@ DEPENDENCIES
   active_wrapper (= 0.2.7)
   active_wrapper (= 0.2.7)
   active_wrapper (= 0.2.7)
-  bundler (= 1.0.0.beta.2)
+  bundler (= 1.0.0.beta.5)
   cucumber (= 0.6.2)
   haml (= 2.2.17)
   haml (= 2.2.17)
+  httparty (= 0.5.2)
   lilypad (= 0.3.0)
   lilypad (= 0.3.0)
   mysql (= 2.8.1)

diff --git a/lib/a_b/boot/console.rb b/lib/a_b/boot/console.rb
@@ -4,8 +4,8 @@
 Bundler.require(:console)
 
 $:.unshift File.dirname(__FILE__) + '/../'
-$:.unshift File.expand_path(File.dirname(__FILE__) + '../../../vendor/a_b_plugin/lib')
-$:.unshift File.expand_path(File.dirname(__FILE__) + '../../../vendor/delayed_job/lib')
+$:.unshift File.expand_path(File.dirname(__FILE__) + '../../../../vendor/a_b_plugin/lib')
+$:.unshift File.expand_path(File.dirname(__FILE__) + '../../../../vendor/delayed_job/lib')
 
 require 'a_b_plugin'
 require 'delayed_job'

diff --git a/vendor/a_b_plugin/Gemfile b/vendor/a_b_plugin/Gemfile
@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 v = {
-  :bundler => '=1.0.0.beta.2',
+  :bundler => '=1.0.0.beta.5',
   :httparty => '=0.5.2',
   :json => '=1.2.0',
   :rack_test => '=0.5.3',
@@ -13,14 +13,15 @@ v = {
 
 group :gemspec do
   gem 'bundler', v[:bundler]
+  gem 'httparty', v[:httparty]
 end
 
 group :gemspec_dev do
   gem 'rspec', v[:rspec]
 end
 
 group :lib do
-  gem 'httparty', v[:httparty], :require => %w(httparty)
+  gem 'httparty', v[:httparty]
 end
 
 group :rake do

diff --git a/vendor/a_b_plugin/Gemfile.lock b/vendor/a_b_plugin/Gemfile.lock
@@ -1,38 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.5)
-      actionpack (= 2.3.5)
     actionmailer (2.3.5)
       actionpack (= 2.3.5)
     actionpack (2.3.5)
       activesupport (= 2.3.5)
       rack (~> 1.0.0)
-    actionpack (2.3.5)
-      activesupport (= 2.3.5)
-      rack (~> 1.0.0)
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
     activerecord (2.3.5)
       activesupport (= 2.3.5)
     activeresource (2.3.5)
       activesupport (= 2.3.5)
-    activeresource (2.3.5)
-      activesupport (= 2.3.5)
     activesupport (2.3.5)
-    activesupport (2.3.5)
-    crack (0.1.6)
     crack (0.1.6)
     httparty (0.5.2)
       crack (= 0.1.6)
-    httparty (0.5.2)
-      crack (= 0.1.6)
-    json (1.2.0)
     json (1.2.0)
     rack (1.0.1)
-    rack (1.0.1)
-    rack-test (0.5.3)
-      rack (>= 1.0)
     rack-test (0.5.3)
       rack (>= 1.0)
     rails (2.3.5)
@@ -42,27 +25,16 @@ GEM
       activeresource (= 2.3.5)
       activesupport (= 2.3.5)
       rake (>= 0.8.3)
-    rails (2.3.5)
-      actionmailer (= 2.3.5)
-      actionpack (= 2.3.5)
-      activerecord (= 2.3.5)
-      activeresource (= 2.3.5)
-      activesupport (= 2.3.5)
-      rake (>= 0.8.3)
-    rake (0.8.7)
     rake (0.8.7)
     rspec (1.3.0)
-    rspec (1.3.0)
-    sinatra (1.0)
-      rack (>= 1.0)
     sinatra (1.0)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.0.0.beta.2)
+  bundler (= 1.0.0.beta.5)
   httparty (= 0.5.2)
   json (= 1.2.0)
   rack-test (= 0.5.3)

diff --git a/vendor/a_b_plugin/Rakefile b/vendor/a_b_plugin/Rakefile
@@ -5,7 +5,7 @@ Bundler.require(:rake)
 
 def gemspec
   @gemspec ||= begin
-    file = File.expand_path('../gem_template.gemspec', __FILE__)
+    file = File.expand_path('../a_b_plugin.gemspec', __FILE__)
     eval(File.read(file), binding, file)
   end
 end

diff --git a/vendor/a_b_plugin/lib/a_b_plugin.rb b/vendor/a_b_plugin/lib/a_b_plugin.rb
@@ -4,6 +4,8 @@
 
 Bundler.require(:lib)
 
+require 'httparty'
+
 $:.unshift File.dirname(__FILE__) + '/a_b_plugin'
 
 require 'version'