rs-api-tools 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c854b79a460b0c432cd8bbfb7e260fd630ecafa
-  data.tar.gz: db3e2c9037c24a6f96452324690b50c5c27c60a4
+  metadata.gz: c6c61c438074f0ea0b7f9768be0e3177bb5b13ec
+  data.tar.gz: b3037bfb6c61cae09b1bc3d881be120a470dc8ea
 SHA512:
-  metadata.gz: d6004ac7c3848bf1ca5b75f3889588d98a1a3b5a0f1edaf99285f29a38532297a31aa469f3174e6d9a105efffcfbd1f282d7b34187753765fb06c3dd98ef6d9f
-  data.tar.gz: 62fb5384c226a47b2041e40182dca7fb5c06e8db61072d18f8ebd61f08200e97fd1d4a0e174639b7e888f7b99ad1a7ebbb298237417ea8770e9a36e6f619318a
+  metadata.gz: 981c1fd8c80e2892b5b91b1a7010f694f22df5ae419f0cd02bca7980a2a6100078ebd35bae9869e6bb8f8de7ea39d2a94d3b7500823918cff618ba18ab64be50
+  data.tar.gz: 6c37c1710ca89b89ce904ae9a43f68eaa91785f3ac23f56cb1189d902baec0fff11f554aba66d1022e21d35bddc172c89881c0c9e89d6ab7cba680695828b0c0

data/bin/rs-create-deployment

@@ -1,5 +1,7 @@
 #!/usr/bin/ruby
 
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
 def usage
   puts "usage: rs-create-deployment"
   puts ''
@@ -15,30 +17,38 @@ def help_info
   puts ''
   puts "Creates a RightScale Deployment."
   puts ''
-  puts "examples:  rs-create-deployment"
+  puts "examples:  rs-create-deployment --name Gremlins"
+  puts "           rs-create-deployment --metadata https://raw.github.com/rightscale-meta/deployments/master/base_servertemplate_for_linux_v13.5.yaml --edit"
+  puts "           rs-create-deployment --metadata rightscale.yaml"
   puts ''
 end
 
 require 'rubygems'
 require 'getoptlong'
+require 'yesno'
+require 'yaml'
+require 'rightscale_metadata'
 
 deployment = Hash.new
-deployment['description'] = ''
 deployment['name'] = false
+deployment['description'] = ''
 deployment['server_tag_scope'] = 'account'
+deployment['metadata_source'] = false
 
-metadata = false
-interactive = true
-verbose = false
-dry = false
-debug = false
-help = false
+settings = Hash.new
+settings['interactive'] = true
+settings['verbose'] = false
+settings['dry'] = false
+settings['edit'] = false
+settings['debug'] = false
+settings['help'] = false
 
 opts = GetoptLong.new(
   [ '--name', '-n', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--description', '-d', GetoptLong::OPTIONAL_ARGUMENT ],
   [ '--metadata', '-m', GetoptLong::OPTIONAL_ARGUMENT ],
   [ '--non-interactive', GetoptLong::NO_ARGUMENT ],
+  [ '--edit', GetoptLong::NO_ARGUMENT ],
   [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
   [ '--debug', '-D', GetoptLong::NO_ARGUMENT ],
   [ '--dry', GetoptLong::NO_ARGUMENT ],
@@ -52,68 +62,58 @@ opts.each do |opt, arg|
   when '--description'
     deployment['description'] = arg
   when '--metadata'
-    metadata = arg
+    deployment['metadata_source'] = arg
   when '--non-interactive'
-    interactive = false
+    settings['interactive'] = false
   when '--help'
-    help = true
+    settings['help'] = true
   when '--verbose'
-    verbose = true
+    settings['verbose'] = true
   when '--debug'
-    debug = true
+    settings['debug'] = true
   when '--dry'
-    dry = true
+    settings['dry'] = true
+  when '--edit'
+    settings['edit'] = true
 	end
 end
 
-if help
+if settings['help']
   help_info
   exit
 end
 
-usage_exit if !(deployment['name'] || metadata)
-
-def yesno
-  begin
-    system("stty raw -echo")
-    str = STDIN.getc
-  ensure
-    system("stty -raw echo")
-  end
-  if str.downcase == "y"
-    return true
-  elsif str.downcase == "n"
-    return false
-  else
-    raise "Invalid response. Please enter y/n."
-  end
-end
+puts settings if (settings['debug'] || settings['verbose'])
+usage_exit if !(deployment['name'] || deployment['metadata_source'])
 
-require 'yaml'
 require 'right_api_client'
 rightscale = RightApi::Client.new(YAML.load_file(File.join(ENV['HOME'], '.rightscale', 'right_api_client.yml')))
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'rightscale_metadata'))
-
 # creation via supply of metadata file
-if metadata
-  require 'net/http'
-  require 'uri'
-  require 'yaml'
-
-  uri = URI.parse(metadata)
-  if %w( http https ).include?(uri.scheme)
-    metadata = YAML.load(Net::HTTP.get(uri))
-  else
-    metadata = YAML.load_file(metadata)
+if deployment['metadata_source']
+  metadata = RightScaleMetadata.new(deployment['metadata_source']).metadata
+  if settings['edit']
+    require 'securerandom'
+
+    def editor_command
+      ENV.fetch('EDITOR') { 'vi' }
+    end
+    temp_path = "/tmp/rs-meta-#{Process.pid}-#{SecureRandom.hex}"
+    puts "metadata tempfile: #{temp_path}" if settings['debug'] if settings['debug']
+    IO.write(temp_path, YAML::dump(metadata))
+    system("#{editor_command} #{temp_path}")
+    metadata = RightScaleMetadata.new(temp_path).metadata
   end
-  deployment = deployment.merge(metadata['deployment'])
 end
 
+deployment.merge!(metadata['deployment'])
+
+puts deployment if settings['debug']
+
 puts "Creating deployment, '#{deployment['name']}'."
-puts deployment if (verbose || debug)
+puts deployment if (settings['verbose'] || settings['debug'])
 
-if dry
+if settings['dry']
   puts 'Dry run, skipping creation of deployment.'
   exit
 else
@@ -121,9 +121,9 @@ else
   puts "Success, resource href: #{created_deployment.href}."
 end
 
-if metadata
+if deployment['metadata_source']
   puts 'Creating servers...'
-  puts deployment['servers'] if debug
+  puts deployment['servers'] if settings['debug']
   deployment['servers'].each { |server|
     server['instance'] = Hash.new
     server['deployment_href'] = created_deployment.href
@@ -145,7 +145,8 @@ if metadata
     server['instance']['cloud_href'] = "/api/clouds/#{server['cloud_id']}"
     
     puts 'Creating server.'
-    puts "server: #{server}" if (debug || verbose)
-    rightscale.servers.create({ :server => server })
+    puts "server: #{server}" if (settings['debug'] || settings['verbose'])
+    created_server = rightscale.servers.create({ :server => server })
+    puts "Success, resource href: #{created_server.href}."
   }
 end

data/bin/rs-describe-instance-self

@@ -0,0 +1,85 @@
+#!/usr/bin/ruby
+
+def usage
+  puts "usage: rs-describe-instance-self"
+  puts ''
+end
+
+def usage_exit
+  usage; exit
+end
+
+def help_info
+  puts("#{$0}")
+  puts ''
+  puts "Describes the RightScale instance using the instance-facing API."
+  puts ''
+  puts 'Note: this can only be run on a RightScale-managed server.)'
+  puts ''
+  puts "examples:  rs-describe-instance-self"
+  puts ''
+end
+
+require 'rubygems'
+require 'getoptlong'
+require 'yaml'
+
+settings = Hash.new
+settings['output'] = 'yaml'
+settings['silent'] = false
+settings['verbose'] = false
+settings['debug'] = false
+settings['help'] = false
+settings['silent'] = false
+
+opts = GetoptLong.new(
+  [ '--xml', '-x', GetoptLong::NO_ARGUMENT ],
+  [ '--json', '-j', GetoptLong::NO_ARGUMENT ],
+  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
+  [ '--debug', '-D', GetoptLong::NO_ARGUMENT ],
+  [ '--silent', '-s', GetoptLong::NO_ARGUMENT ],
+  [ '--help', '-h', GetoptLong::NO_ARGUMENT ]
+)
+
+opts.each do |opt, arg|
+  case opt
+  when '--xml'
+    settings['output'] = 'xml'
+  when '--json'
+    settings['output'] = 'json'
+  when '--help'
+    settings['help'] = true
+  when '--verbose'
+    settings['verbose'] = true
+  when '--debug'
+    settings['debug'] = true
+  when '--silent'
+    settings['silent'] = true
+	end
+end
+
+if settings['help']
+  help_info
+  exit
+end
+
+puts settings if settings['debug']
+
+require '/var/spool/cloud/user-data.rb'
+require 'right_api_client'
+
+account_id, instance_token = ENV['RS_API_TOKEN'].split /:/
+
+puts 'Getting instance...' unless settings['silent']
+instance = RightApi::Client.new(:instance_token => instance_token, :account_id => account_id).get_instance.raw
+
+case settings['output']
+when 'xml'
+  require "active_support/core_ext"
+  puts instance.to_xml(:root => 'instance')
+when 'json'
+  require 'json'
+  puts JSON.pretty_generate(instance)
+when 'yaml'
+  puts instance.to_yaml
+end

data/lib/yesno.rb

@@ -0,0 +1,15 @@
+def yesno
+  begin
+    system("stty raw -echo")
+    str = STDIN.getc
+  ensure
+    system("stty -raw echo")
+  end
+  if str.downcase == "y"
+    return true
+  elsif str.downcase == "n"
+    return false
+  else
+    raise "Invalid response. Please enter y/n."
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rs-api-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Chris Fordham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ executables:
 - rs-describe-ec2-ebs-volumes
 - rs-bind-executable
 - rs-terminate-server
+- rs-describe-instance-self
 - rs-run-recipe
 - rs-describe-servertemplates
 - rs-search-tags
@@ -162,6 +163,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/librarian_chef_dsl_parser.rb
+- lib/yesno.rb
 - lib/rightscale_metadata.rb
 - bin/rs-create-alert
 - bin/rs-describe-rightscripts
@@ -196,6 +198,7 @@ files:
 - bin/rs-describe-ec2-ebs-volumes
 - bin/rs-bind-executable
 - bin/rs-terminate-server
+- bin/rs-describe-instance-self
 - bin/rs-run-recipe
 - bin/rs-describe-servertemplates
 - bin/rs-search-tags