fix chef/providers conflict

flexera-public · Aug 27, 2012 · fd80883 · fd80883
1 parent b971075
commit fd80883
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -205,7 +205,10 @@ DEPENDENCIES
   rest-client (= 1.6.7)
   right_agent!
   right_amqp!
+  right_http_connection (~> 1.3)
   right_link!
+  right_popen (~> 1.0)
+  right_scraper (= 3.0.1)
   right_support!
   rspec (~> 1.3)
   ruby-debug

diff --git a/Rakefile b/Rakefile
@@ -157,7 +157,7 @@ task :load_env do
   require 'irb'
   BASE_DIR = File.join(File.dirname(__FILE__), 'lib')
   require File.normalize_path(File.join(BASE_DIR, 'instance'))
-  require File.normalize_path(File.join(BASE_DIR, 'chef', 'providers'))
+  require File.normalize_path(File.join(BASE_DIR, 'chef', 'right_providers'))
   require File.normalize_path(File.join(BASE_DIR, 'chef', 'plugins'))
   require File.normalize_path(File.join(BASE_DIR, 'repo_conf_generators'))
 end

diff --git a/init/init.rb b/init/init.rb
@@ -32,7 +32,7 @@
 
 BASE_DIR = File.join(File.dirname(__FILE__), '..', 'lib')
 require File.normalize_path(File.join(BASE_DIR, 'instance'))
-require File.normalize_path(File.join(BASE_DIR, 'chef', 'providers'))
+require File.normalize_path(File.join(BASE_DIR, 'chef', 'right_providers'))
 require File.normalize_path(File.join(BASE_DIR, 'chef', 'plugins'))
 require File.normalize_path(File.join(BASE_DIR, 'repo_conf_generators'))
 

diff --git a/lib/chef/providers.rb → lib/chef/right_providers.rb b/lib/chef/providers.rb → lib/chef/right_providers.rb
diff --git a/lib/instance/cook/cook.rb b/lib/instance/cook/cook.rb
@@ -24,7 +24,7 @@
 require 'right_agent/core_payload_types'
 
 
-require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'chef', 'providers'))
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'chef', 'right_providers'))
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'chef', 'plugins'))
 
 module RightScale

diff --git a/spec/actors/spec_helper.rb b/spec/actors/spec_helper.rb
@@ -22,4 +22,4 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'instance'))
-require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'chef', 'providers'))
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'chef', 'right_providers'))
diff --git a/spec/chef/spec_helper.rb b/spec/chef/spec_helper.rb
@@ -25,7 +25,7 @@
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'instance', 'cook'))
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'clouds'))
 
-require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'chef', 'providers'))
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'chef', 'right_providers'))
 
 shared_examples_for 'generates cookbook for chef runner' do
   before(:all) do

diff --git a/spec/instance/cook/executable_sequence_spec.rb b/spec/instance/cook/executable_sequence_spec.rb
@@ -23,7 +23,7 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'right_scraper'
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'chef', 'plugins'))
-require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'chef', 'providers'))
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'chef', 'right_providers'))
 
 module RightScale
   class ExecutableSequence

diff --git a/spec/lib/actors/cook.rb b/spec/lib/actors/cook.rb
@@ -32,7 +32,7 @@
 
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'instance'))
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'instance', 'cook'))
-require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'chef', 'providers'))
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'chef', 'right_providers'))
 
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', 'agent_test_config'))