Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge "Add rake to the dev/test gemfile. Optimize the plugin.rb file …

…to load the vmc specs only once."
  • Loading branch information...
commit 13a0363cd86fb96c1858df4fc368af095feaa70f 2 parents eb300d3 + 36da6c5
Jennifer Hickey and Tim Labeeuw authored Gerrit Code Review committed
Showing with 20 additions and 2 deletions.
  1. +13 −1 Gemfile
  2. +2 −1  lib/vmc/plugin.rb
  3. +5 −0 vmc.gemspec
View
14 Gemfile
@@ -1,5 +1,9 @@
source "http://rubygems.org"
+#############
+# WARNING: Separate from the Gemspec. Please update both files
+#############
+
gem "json_pure", "~> 1.6"
gem "multi_json", "~> 1.3"
@@ -10,7 +14,15 @@ gem "mothership", :git => "git://github.com/vito/mothership.git"
git "git://github.com/cloudfoundry/vmc-plugins.git" do
gem "manifests-vmc-plugin"
- gem "tunnel-dummy-vmc-plugin"
+ gem "tunnel-vmc-plugin"
+end
+
+group :development, :test do
+ gem "rake"
+end
+
+group :development do
+ gem "auto_tagger"
end
group :test do
View
3  lib/vmc/plugin.rb
@@ -21,7 +21,8 @@ def self.load_all
enabled = Set.new(matching.collect(&:name))
- ((Gem.loaded_specs["vmc"] && Gem.loaded_specs["vmc"].dependencies) || Gem.loaded_specs.values).each do |dep|
+ vmc_gems = Gem.loaded_specs["vmc"]
+ ((vmc_gems && vmc_gems.dependencies) || Gem.loaded_specs.values).each do |dep|
if dep.name =~ /vmc-plugin/
require "#{dep.name}/plugin"
enabled.delete dep.name
View
5 vmc.gemspec
@@ -1,4 +1,9 @@
# -*- encoding: utf-8 -*-
+
+#############
+# WARNING: Separate from the Gemfile. Please update both files
+#############
+
$:.push File.expand_path("../lib", __FILE__)
require "vmc/version"
Please sign in to comment.
Something went wrong with that request. Please try again.