fix merge conflict

flexera-public · Aug 22, 2012 · b971075 · b971075
2 parents 1153256 + 28d998b
commit b971075
Show file tree

Hide file tree

Showing 40 changed files with 75 additions and 202 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,11 @@
 source 'http://s3.amazonaws.com/rightscale_rightlink_gems_dev'
 source :rubygems
 
+gemspec
+
 gem "rubyforge",               "1.0.4"
 gem "rake",                    "0.8.7"
-gem "encryptor",               "1.1.3"
+
 gem "right_support",           :git => 'git://github.com/rightscale/right_support.git',
                                :branch => "master"
 gem "right_agent",             :git => 'git://github.com/rightscale/right_agent.git',
@@ -32,6 +34,9 @@ end
 # DO NOT CHANGE VERSIONS of these gems until you have built a precompiled
 # mswin-platform gem for every one of the gems below AND published it to
 # the rightscale custom gem repository.
+#
+# TODO figure out how to encode these into the gemspec ... very hard to do plat-specific gem dependencies!
+# @see http://stackoverflow.com/questions/4596606/rubygems-how-do-i-add-platform-specific-dependency
 group :not_windows_friendly do
   gem "json",                  "1.4.6"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,6 +28,18 @@ GIT
   specs:
     right_support (2.3.1)
 
+PATH
+  remote: .
+  specs:
+    right_link (5.9.0)
+      chef (>= 0.10.10)
+      encryptor (~> 1.1)
+      right_agent (~> 0.10)
+      right_http_connection (~> 1.3)
+      right_popen (~> 1.0)
+      right_scraper (~> 3.0)
+      right_support (~> 2.0)
+
 GEM
   remote: http://s3.amazonaws.com/rightscale_rightlink_gems_dev/
   remote: http://rubygems.org/
@@ -173,7 +185,6 @@ DEPENDENCIES
   abstract (= 1.0.0)
   bunny (= 0.6.0)
   chef (= 0.10.10.2)
-  encryptor (= 1.1.3)
   erubis (= 2.6.5)
   eventmachine (= 0.12.11.6)
   extlib (= 0.9.14)
@@ -194,9 +205,7 @@ DEPENDENCIES
   rest-client (= 1.6.7)
   right_agent!
   right_amqp!
-  right_http_connection (~> 1.3)
-  right_popen (~> 1.0)
-  right_scraper (= 3.0.1)
+  right_link!
   right_support!
   rspec (~> 1.3)
   ruby-debug

diff --git a/INSTALL.rdoc b/INSTALL.rdoc
@@ -218,7 +218,7 @@ and relaunching.
 
 === Configure RightLink Agent
 
- bin/enroll --root-dir /opt/rightscale/right_link --url $RS_RN_URL --host $RS_RN_HOST --id $RS_RN_ID --token $RS_RN_AUTH
+ bin/enroll --root-dir /var/lib/rightscale/right_link --url $RS_RN_URL --host $RS_RN_HOST --id $RS_RN_ID --token $RS_RN_AUTH
  bin/deploy
 
 === Launch RightLink Agent
@@ -255,7 +255,6 @@ When the system is terminating, you should allow RightLink to run its decommissi
  /usr/bin                        | Public CLI: rs_tag, rs_debug, ...
  /opt/rightscale/bin             | Private CLI: rnac, rad, cook, ...
  /opt/rightscale/sandbox         | Private sandbox (Ruby, RubyGems, monit, ...)
- /opt/rightscale/right_link      | Application logic & support files
 
 === Windows Systems
 

diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,8 @@
 # Activate gem dependencies
 require 'rubygems'
 require 'bundler/setup'
+require 'rubygems/package_task'
+require 'rake/clean'
 
 # Ruby standard library dependencies
 require 'fileutils'
@@ -15,6 +17,13 @@ require File.join(RIGHT_LINK_ROOT, 'lib', 'run_shell')
 
 include RunShell
 
+desc "Build right_link gem"
+Gem::PackageTask.new(Gem::Specification.load("right_link.gemspec")) do |package|
+  package.need_zip = true
+  package.need_tar = true
+end
+
+CLEAN.include('pkg')
 
 def windows?
   return !!(RUBY_PLATFORM =~ /mswin/)

diff --git a/bin/cloud.rb → bin/cloud b/bin/cloud.rb → bin/cloud
diff --git a/bin/cook_runner.rb → bin/cook_runner b/bin/cook_runner.rb → bin/cook_runner
diff --git a/bin/deploy.rb → bin/deploy b/bin/deploy.rb → bin/deploy
@@ -84,8 +84,12 @@ def invoke_rad
         host = "#{url.host}#{host}"
       end
 
+      os_root_dir  = '/var/lib/rightscale/right_link'
+      gem_root_dir = Dir.glob(File.join(AgentConfig.parent_dir, 'right_link-*')).sort.first
+
       cmd_opts = [ 'instance',
-                   '-r', File.join(AgentConfig.parent_dir, 'right_link'),
+                   '-r', os_root_dir,
+                   '-r', gem_root_dir,
                    '-i', ENV['RS_RN_ID'],
                    '-t', ENV['RS_RN_AUTH'],
                    '-h', host,
@@ -121,4 +125,4 @@ def invoke_rad
 # The $0 argument is -e in windows because of how we wrap the call to get live
 # console output. we don't need to worry about symlinks in Windows, so always
 # run the deployer on that platform
-RightScale::AgentDeployerRunner.run if (__FILE__ == $0 || RightScale::Platform.windows?)
+RightScale::AgentDeployerRunner.run
diff --git a/bin/enroll.rb → bin/enroll b/bin/enroll.rb → bin/enroll
diff --git a/bin/rad.rb → bin/rad b/bin/rad.rb → bin/rad
diff --git a/bin/rchk.rb → bin/rchk b/bin/rchk.rb → bin/rchk
diff --git a/bin/rnac.rb → bin/rnac b/bin/rnac.rb → bin/rnac
diff --git a/bin/rs_connect.rb → bin/rs_connect b/bin/rs_connect.rb → bin/rs_connect
diff --git a/bin/rs_log_level.rb → bin/rs_log_level b/bin/rs_log_level.rb → bin/rs_log_level
diff --git a/bin/rs_ohai.rb → bin/rs_ohai b/bin/rs_ohai.rb → bin/rs_ohai
diff --git a/bin/rs_reenroll.rb → bin/rs_reenroll b/bin/rs_reenroll.rb → bin/rs_reenroll
diff --git a/bin/rs_run_recipe.rb → bin/rs_run_recipe b/bin/rs_run_recipe.rb → bin/rs_run_recipe
diff --git a/bin/rs_run_right_script.rb → bin/rs_run_right_script b/bin/rs_run_right_script.rb → bin/rs_run_right_script
diff --git a/bin/rs_shutdown.rb → bin/rs_shutdown b/bin/rs_shutdown.rb → bin/rs_shutdown
diff --git a/bin/rs_tag.rb → bin/rs_tag b/bin/rs_tag.rb → bin/rs_tag
diff --git a/bin/rs_thunk.rb → bin/rs_thunk b/bin/rs_thunk.rb → bin/rs_thunk
diff --git a/bin/rstat.rb → bin/rstat b/bin/rstat.rb → bin/rstat
diff --git a/bin/setup.sh b/bin/setup.sh
diff --git a/bin/system.rb → bin/system b/bin/system.rb → bin/system
diff --git a/lib/clouds/clouds/ec2.rb b/lib/clouds/clouds/ec2.rb
@@ -34,7 +34,7 @@
 # Assembles the command line needed to regenerate cloud metadata on demand.
 def cloud_metadata_generation_command
   ruby_path = File.normalize_path(AgentConfig.sandbox_ruby_cmd)
-  rs_cloud_path = File.normalize_path(File.join(AgentConfig.parent_dir, 'right_link', 'bin', 'cloud.rb'))
+  rs_cloud_path = File.normalize_path(File.join(AgentConfig.parent_dir, 'right_link', 'bin', 'cloud'))
   return "#{ruby_path} #{rs_cloud_path} --quiet --action write_cloud_metadata"
 end
 

diff --git a/lib/gem_dependencies.rb b/lib/gem_dependencies.rb
@@ -21,7 +21,7 @@
 
 require 'rubygems'
 
-# N.B. we can't use File#normalize_path yet because gems haven't been activated
+# N.B. we can't use File#normalize_path yet because gems haven't been activated - Windows safety!
 basedir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 Dir.chdir(basedir) do
   if File.exist?('Gemfile')
@@ -36,6 +36,8 @@
   end
 end
 
+gem 'right_link'
+
 gem 'eventmachine'
 
 gem 'right_support'

diff --git a/lib/instance/executable_sequence_proxy.rb b/lib/instance/executable_sequence_proxy.rb
@@ -155,7 +155,7 @@ def run
     # === Return
     # path(String):: Path to ruby script used to run Chef
     def cook_path
-      relative_path = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'cook_runner.rb')
+      relative_path = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'cook_runner')
       return File.normalize_path(relative_path)
     end
 

diff --git a/right_link.gemspec b/right_link.gemspec
@@ -1,26 +1,39 @@
 # -*- mode: ruby; encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name        = "right_link"
-  s.version     = '0.3'
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+  s.name        = 'right_link'
+  s.version     = '5.9.0'
   s.platform    = Gem::Platform::RUBY
 
   s.authors     = ['RightScale']
   s.email       = 'support@rightscale.com'
   s.homepage    = 'https://github.com/rightscale/right_link'
-  s.summary     = %q{Reusable foundation code.}
-  s.description = %q{A toolkit of useful, reusable foundation code created by RightScale.}
-
-  s.required_rubygems_version = ">= 1.3.7"
+
+  s.summary     = %q{RightScale management agent.}
+  s.description = %q{A daemon that connects systems to the RightScale cloud management platform.}
 
+  s.required_rubygems_version = '>= 1.3.7'
+
+  s.add_runtime_dependency('right_agent', ['~> 0.10'])
+  s.add_runtime_dependency('right_scraper', ['~> 3.0'])
+  s.add_runtime_dependency('right_popen', ['~> 1.0'])
+  s.add_runtime_dependency('right_http_connection', ['~> 1.3'])
+  s.add_runtime_dependency('right_support', ['~> 2.0'])
+
+  s.add_runtime_dependency('chef', ['>= 0.10.10'])
+  s.add_runtime_dependency('encryptor', ['~> 1.1'])
+
   s.files = Dir.glob('Gemfile') +
             Dir.glob('Gemfile.lock') +
             Dir.glob('init/*') +
             Dir.glob('actors/*.rb') +
-            Dir.glob('bin/*.rb') +
-            Dir.glob('bin/*.sh') +
+            Dir.glob('bin/*') +
             Dir.glob('lib/**/*.rb') +
             Dir.glob('lib/**/*.pub') +
             Dir.glob('scripts/*') +
             Dir.glob('lib/instance/cook/*.crt')
+
+  s.executables = Dir.glob('bin/*').map { |f| File.basename(f) }
 end
diff --git a/scripts/windows/rad.cmd b/scripts/windows/rad.cmd
@@ -27,4 +27,4 @@ if %ERRORLEVEL% neq 0 (
   exit /B %ERRORLEVEL%
 )
 
-%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rad.rb %*
+%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rad %*
diff --git a/scripts/windows/rchk.cmd b/scripts/windows/rchk.cmd
@@ -27,4 +27,4 @@ if %ERRORLEVEL% neq 0 (
   exit /B %ERRORLEVEL%
 )
 
-%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rchk.rb %*
+%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rchk %*
diff --git a/scripts/windows/rnac.cmd b/scripts/windows/rnac.cmd
@@ -27,4 +27,4 @@ if %ERRORLEVEL% neq 0 (
   exit /B %ERRORLEVEL%
 )
 
-%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rnac.rb %*
+%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rnac %*
diff --git a/scripts/windows/rs_connect.cmd b/scripts/windows/rs_connect.cmd
@@ -37,4 +37,4 @@ if %ERRORLEVEL% neq 0 (
 )
 
 rem # connect
-%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rs_connect.rb %*
+%RS_RUBY_EXE% %RS_RIGHT_LINK_HOME%\right_link\bin\rs_connect %*