rightimage_tools 0.1.0 → 0.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "rest_connection"
-gem "ruby-debug"
+gem "right_aws"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -10,14 +11,18 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
+require 'lib/rightimage_tools' 
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "rightimage_tools"
+  gem.version = RightImageTools::VERSION
   gem.homepage = "http://github.com/rightscale/rightimage_tools"
   gem.license = "MIT"
   gem.summary = %Q{A set of tools to support the building of RightImages}
+  gem.files = %w(LICENSE.txt VERSION README.rdoc Rakefile Gemfile) + FileList["{bin,lib}/**/*"].to_a
+  gem.executables = %w(image_mover mci_merge update_s3_index)
   gem.description = gem.summary
   gem.email = "peter.schroeter@rightscale.com"
   gem.authors = ["Peter Schroeter"]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/image_mover

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+require 'right_aws'
+
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+require File.expand_path(File.join(File.dirname(THIS_FILE), '..', 'lib', 's3_html_indexer'))
+
+options = {}
+opts = OptionParser.new
+opts.on('-k', '--key KEY', "S3 key path (Ex: kvm/centos/5.6/RightImage_CentOS_5.6_x64_v5.7.14.qcow2.bz2)") { |key| options[:key] = key }
+opts.on('-s', '--source BUCKET', "Source S3 bucket (Ex: rightscale-cloudstack-dev)") { |bucket| options[:bucket_from] = bucket }
+opts.on('-d', '--destination BUCKET', "Destination S3 bucket (Ex: rightscale-cloudstack)") { |bucket| options[:bucket_to] = bucket }
+opts.on_tail('-h', '--help', "Show this message") do
+  puts "#{opts}\n"
+  return false
+end
+
+begin
+  opts.parse!
+  mandatory = [:bucket_to, :bucket_from, :key]
+  missing = mandatory.select { |param| options[param].nil? }
+  if not missing.empty?
+    puts "Missing options: #{missing.join(", ")}"
+    puts opts
+    exit
+  end
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+  puts $!.to_s
+  puts opts
+  exit
+end
+
+raise "ERROR: you must define AWS_ACCESS_KEY_ID in you environment. " unless ENV["AWS_ACCESS_KEY_ID"]
+raise "ERROR: you must define AWS_SECRET_ACCESS_KEY in you environment. " unless ENV["AWS_SECRET_ACCESS_KEY"]
+
+s3 = RightAws::S3.new(ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
+bucket_from = s3.bucket(options[:bucket_from])
+bucket_to = s3.bucket(options[:bucket_to])
+
+puts "Moving file #{options[:key]} from #{options[:bucket_from]} to #{options[:bucket_to]}"
+key_from = RightAws::S3::Key.create(bucket_from, options[:key])
+key_to = RightAws::S3::Key.create(bucket_to, options[:key])
+key_from.move(key_to)
+raise "File move failed" unless key_to.exists?
+
+puts "Granting public read"
+grant = RightAws::S3::Grantee.new(key_to, 'http://acs.amazonaws.com/groups/global/AllUsers', 'READ', :apply_and_refresh)
+raise "Grant update failed" unless grant
+
+puts "Reindexing source bucket #{bucket_from}"
+indexer_from = RightImage::S3HtmlIndexer.new(options[:bucket_from], ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
+indexer_from.to_html("index-from.html")
+indexer_from.upload_index("index-from.html")
+
+puts "Reindexing destination bucket #{bucket_to}"
+indexer_to = RightImage::S3HtmlIndexer.new(options[:bucket_to], ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
+indexer_to.to_html("index-to.html")
+indexer_to.upload_index("index-to.html")

data/bin/mci_merge

@@ -0,0 +1,117 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+#require 'ruby-debug'
+require 'rest_connection'
+require 'tmpdir'
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'mci'))
+
+def aws_id_from_href(href)
+  id = href.split("/").last
+  id.split("?").first
+end
+
+def ask(prompt)
+  puts prompt+" "
+  res = gets
+  unless res =~ /^[yY]/
+    puts "Aborting"
+    exit 0
+  end
+end
+
+def parse_options
+  opts = OptionParser.new
+  options = {}
+  opts.on('-s', '--source MCI_SUFFIX', "Suffix of MCI to copy from i.e. 'v5.8.0_Beta_Dev2'") { |name| options[:src] = name}
+  opts.on('-d', '--destination MCI_SUFFIX', "Suffix of MCI to copy to i.e. 'v5.8'") { |name| options[:dest] = name}
+  opts.on_tail('-h', '--help', "Show help") do
+    puts "#{opts}\n"
+    return false
+  end
+
+  begin
+    opts.parse!
+    mandatory = [:src, :dest]
+    missing = mandatory.select { |param| options[param].nil? }
+    if not missing.empty?
+      puts "Missing options: #{missing.join(", ")}"
+      puts opts
+      exit
+    end
+  rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+    puts $!.to_s
+    puts opts
+    exit
+  end
+  options
+end
+
+options = parse_options
+ENV['REST_CONNECTION_LOG'] = Dir.tmpdir + "/mci_merge_rest.log"
+
+mcis = MultiCloudImage.find_all
+sources = []
+dests   = []
+
+mcis.each do |mci|
+  if mci.name =~ /RightImage.*#{Regexp.escape(options[:src])}$/
+    sources << MultiCloudImageInternal.find(mci.rs_id.to_i)
+  end
+end
+
+puts "Found #{sources.length} MCIs to move: "
+
+sources.each_with_index do |mci, i|
+  # print out source mci
+  print i.to_s.ljust(2)+") "
+  puts mci.name
+  clouds = mci.multi_cloud_image_cloud_settings.map {|s| s.cloud}
+  puts "    CLOUDS: "+clouds.join(", ")
+  print "    -->"
+
+  # find a destination mci and print that if found
+  # else note we'll make a new mci for the destination
+  name_no_suffix = mci.name.sub(options[:src],"") 
+  dest_mci_name = name_no_suffix + options[:dest]
+  found = mcis.find { |new_mci| new_mci.name == dest_mci_name }
+  if found
+    dest_mci = MultiCloudImageInternal.find(found.rs_id.to_i)
+    dests << dest_mci
+    print dest_mci.name
+  else
+    dests << dest_mci_name
+    print "NEW MCI: "
+    print dest_mci_name
+  end
+  puts ""
+end
+
+ask("Continue - Y/N?")
+
+mci_tool = RightImageTools::MCI.new
+sources.each_with_index do |src_mci, i|
+  dest_mci = dests[i]
+  if dest_mci.class == String
+    src_mci.multi_cloud_image_cloud_settings.each do |s|
+      image_id = aws_id_from_href(s.image_href)
+      puts "New MCI with image: cloud_id=#{s.cloud_id.to_i}, mci_name=#{dest_mci}, image_id=#{image_id}"
+      mci_tool.add_image_to_mci(
+        :cloud_id=>s.cloud_id.to_i,
+        :name=>dest_mci,
+        :image_id=>image_id)
+    end
+  else
+    src_mci.multi_cloud_image_cloud_settings.each do |s|
+      image_id = aws_id_from_href(s.image_href)
+      puts "Adding image to MCI #{dest_mci.rs_id}: cloud_id=#{s.cloud_id.to_i}, mci_id=#{dest_mci.rs_id}, image_id=#{image_id}"
+      mci_tool.add_image_to_mci(
+        :cloud_id=>s.cloud_id.to_i,
+        :mci_id=>dest_mci.rs_id,
+        :image_id=>image_id)
+    end
+  end
+end
+

data/bin/update_s3_index

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+require File.expand_path(File.join(File.dirname(THIS_FILE), '..', 'lib', 's3_html_indexer'))
+
+raise "ERROR: you must define AWS_IMAGE_BUCKET in you environment. " unless ENV["AWS_IMAGE_BUCKET"]
+raise "ERROR: you must define AWS_ACCESS_KEY_ID in you environment. " unless ENV["AWS_ACCESS_KEY_ID"]
+raise "ERROR: you must define AWS_SECRET_ACCESS_KEY in you environment. " unless ENV["AWS_SECRET_ACCESS_KEY"]
+
+indexer = RightImageTools::S3HtmlIndexer.new(ENV["AWS_IMAGE_BUCKET"], ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
+indexer.to_html("index.html")
+indexer.upload_index("index.html")

data/lib/id_list.rb

@@ -0,0 +1,71 @@
+module RightImage
+  require 'json'
+  
+  # Manages a global store of image ids for images that have been 
+  # on a single rightimage creator instance.
+  # The image data is persisted on the local filesystem.
+  #
+  class IdList
+      
+    def initialize(logger = nil)
+      @log = (logger) ? logger : Logger.new(STDOUT)
+      @file = ::File.join(ENV["HOME"], "rightimage_id_list")
+    end
+    
+    # Pass in id that the cloud provider passes back upon registration
+    # NOTE: Be sure to set storage type for EC2 "EBS" images so we can 
+    # properly know what kind of MCI to make later.
+    #
+    def add(id, storage_type = nil)
+      list_load
+      key = id.to_s
+      key.chomp!
+      @log.info("Adding #{key} to #{(@list) ? 'existing' : 'empty'} id list.")
+      entry = { key => { } }
+      entry[key]["storage_type"] = storage_type if storage_type
+      @list.merge!(entry)
+      list_save
+    end
+    
+    # Returns a hash of image ids registered from this instance.
+    # The keys are image ids, the values contain metadata 
+    # (like "storage_type")
+    # Intended to be used in a loop. For Example:
+    #   images = RightImage::IdList.new(Chef::Log).to_hash
+    #   images.each do |id, params|
+    #     ...
+    #   end
+    #
+    def to_hash
+      list_load
+      @log.info("Loaded #{(@list)?"existing":"empty"} id list.")
+      @list
+    end
+   
+    # Wipes out the list by deleting the file.
+    #
+    def clear
+      if ::File.exists?(@file) 
+        @log.info("Deleted id list file.")
+        ::File.delete(@file)
+      end
+    end
+    
+    private
+    
+    def list_save
+      ::File.open(@file, "w") { |f| f.write(@list.to_json) }
+    end
+    
+    def list_load
+      @list = { }
+      if ::File.exists?(@file)
+        json = nil
+        ::File.open(@file, "r") { |f| json = f.read() }
+        @list = JSON.parse(json) if json
+      end
+    end
+  end
+  
+end
+

data/lib/mci.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'logger'
-require 'ruby-debug'
+#require 'ruby-debug'
 require 'rest_connection'
 
 module RightImageTools
@@ -55,12 +55,14 @@ module RightImageTools
     def add_image_to_mci(options)
       cloud_id = options[:cloud_id].to_i 
       image_id = options[:image_id]
-      mci_name = options[:name]
+      mci_name = options[:name] || options[:mci_name]
+      mci_id   = options[:mci_id] || options[:id]
       description = options[:description]
 
       raise ArgumentError, ":cloud_id not supplied" unless cloud_id > 0
       raise ArgumentError, ":image_id not supplied" unless image_id =~ /./
-      raise ArgumentError, "MCI name (:name) not supplied" unless mci_name =~ /./
+      raise ArgumentError, "MCI name (:name) or id (:mci_id) not supplied" unless (mci_name =~ /./ || mci_id =~ /^\d+$/)
+      raise ArgumentError, "MCI (:mci_id) supplied but an integer" if mci_id and mci_id !~ /^\d+$/
 
       image_id = image_id.split("/").last
 
@@ -69,8 +71,9 @@ module RightImageTools
           raise ArgumentError, "image_id #{image_id} doesn't look like an amazon ami"
         end
       end
-
-      mci = find_mci(cloud_id, mci_name) 
+      
+      mci = find_mci_by_id(cloud_id, mci_id) if mci_id
+      mci = find_mci(cloud_id, mci_name) unless mci
       #validate_mci_name(mci_name) unless mci
       mci = create_mci(cloud_id, mci_name, description) unless mci
       add_rightlink_tag(mci)
@@ -135,6 +138,17 @@ module RightImageTools
     end
 
     # return MultiCloudImageInternal, or nil
+    def find_mci_by_id(cloud_id,mci_id)
+      if api_version(cloud_id) == "1.0"
+        existing_mci = MultiCloudImageInternal.find(mci_id.to_i)
+      else
+        existing_mci = McMultiCloudImage.find(mci_id.to_i)
+      end
+      raise ArgumentError, "Could not find #{existing_mci.rs_id}" unless existing_mci
+      @logger.info("Using mci #{existing_mci.rs_id} named #{existing_mci.name}")
+      existing_mci
+    end
+
     def find_mci(cloud_id, mci_name)
       mcis = []
       if api_version(cloud_id) == "1.0"

data/lib/rightimage_tools.rb

@@ -3,3 +3,7 @@ module RightImageTools
 end
 
 require File.join(File.dirname(__FILE__), 'mci')
+require File.join(File.dirname(__FILE__), 'id_list')
+require File.join(File.dirname(__FILE__), 'util')
+# command line tool 
+#require File.join(File.dirname(__FILE__), 's3_html_indexer')

data/lib/s3_html_indexer.rb

@@ -0,0 +1,251 @@
+require 'rubygems'
+require 'right_aws'
+
+module RightImageTools
+
+  class S3HtmlIndexer
+
+  def initialize(bucket, id=nil, key=nil)
+    @s3 = RightAws::S3.new(id, key)
+    @dev_bucket = bucket.downcase.include?("dev")
+    @bucket = @s3.bucket(bucket)
+    @keys = @bucket.keys
+    @auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
+  end
+
+  def ver(key)
+    key.match(/v[0-9]+\.[0-9]+\.[0-9]+/).to_s
+  end
+  
+  def to_html(filename)
+    # Create hash hierarchy from bucket list
+    @keys.reject! { |path| path.full_name =~ /index.html/ }
+    #@keys.sort! {|x,y| ver(x.full_name) <=> ver(y.full_name) }  #TODO: sort by rightlink version
+    @keys.each do |path| 
+      
+      next unless is_public?(path)
+      
+      sub = @auto_hash
+      path.full_name.split( "/" ).each do |dir| 
+        sub = sub[dir] 
+      end
+      
+      sub[:link] = fix_public_endpoint(path.public_link)
+      sub[:size] = path.size
+      sub[:date] = path.last_modified.strftime("%m/%d/%Y")
+      sub[:md5sum] = path.e_tag.gsub(/\"/, "")
+      
+    end
+
+    # make a non-auto hash copy
+    dirs = Hash.new
+    dirs = dirs.merge(@auto_hash)
+
+    # visualize hierarchy
+    dirs.each do |k,v|
+      @file = File.open(filename, "w")
+      output("<html>")
+      add_style
+      display_dirs(k,v)
+      output("</html>")
+      @file.close
+    end
+  end
+  
+  def upload_index(filename)
+    @bucket.put("index.html", File.open(filename), {}, 'public-read')
+  end
+  
+  private 
+  
+    def is_public?(key)
+      key.refresh    
+      puts "Key: #{key.name}"
+      key.grantees.each do |g|
+        puts "grantee:#{g.name} perms:#{g.perms}"
+        if g.name.to_s == "AllUsers" && g.perms.to_s == "READ"
+          puts "Is public!!!" 
+          return true
+        end
+      end
+      false
+    end
+    
+    def display_dirs(k,v,level=0)
+      return unless v
+      unless v.keys.include?(:link)
+        add_header(k, level)
+        v.sort_by {|k2, v2| k2}.each do |k2, v2|
+          display_dirs(k2, v2, level+1)
+        end
+        add_footer(k, level)
+      else
+        output("<tr class='code'>")
+        output("<td><a href='#{v[:link]}'>#{k}</a></td>")
+        output("<td>#{v[:size].to_i/(1024*1024)}MB</td>")
+        output("<td>#{v[:date]}</td>")
+         output("<td>#{v[:md5sum]}</td>")
+        output("</tr>")
+      end
+    end
+        
+    def disclaimer
+      if @dev_bucket
+        "The following RightImages are currently in RightScale development and testing.  They are not supported by RightScale.  For RightImages that RightScale supports, please see our <a href='http://rightscale-cloudstack.s3-website-us-west-1.amazonaws.com/index.html'>production images</a>"
+      else
+        "The following RightImages are tested and supported by RightScale for general use.  For further information regarding use of these images with RightScale, please contact your RightScale account manager or sign up for an account at <a href='http://www.rightscale.com'>www.rightscale.com</a>."
+      end
+    end
+    
+    def add_header(str, level)
+      case level
+      when 0
+        # bucket name
+        output("<div id='header'><img alt='Embedded Image' width='140' height='19' src='#{encoded_logo}' /></div>")
+        output("<div class='bucket common'>#{str.gsub(/rightscale-/,"").upcase}")
+        output("<br/><br/>")
+        output("<div class='disclaimer code common'>#{disclaimer}</div>")
+        output("<br/>")
+        output("</div>")
+      when 1
+        # Hypervisor 
+        output("<div class='hypervisor common'>")
+        output("<h#{level-1}>#{str.upcase} Hypervisor</h#{level-1}>\n")
+        output("</div>")
+        output("<div class='platform common'>")
+        output("<table style='padding:none; size:90%'>")
+        output("<tr style='border: solid 1px black;'>")
+        output("<th style='text-align:left'>Image</th>")
+        output("<th>Size</th>")
+        output("<th>Date</th>")
+        output("<th>MD5</th>")
+        output("</tr>")
+      when 2
+        return
+        # OS
+      when 3
+        return
+      else
+        # image
+        # output("<div class='platform'>")
+      end
+    end
+    
+    def add_footer(str, level)
+      case level
+      when 0
+      when 1
+        output("</table>")
+        output("</div>")
+        output("<br/>")
+        output("</div>")
+        output("<br/><br/>")
+      when 2
+        return
+      when 3
+        return
+      else
+        # output("</div>")
+      end
+    end
+
+    # https://s3.amazonaws.com/rightscale-cloudstack/foo
+    # to
+    # https://rightscale-cloudstack.s3.amazonaws.com 
+    def fix_public_endpoint(link)
+      link_ary = link.split("/")
+      bucket = link_ary[3]
+      host = link_ary[2]
+      link_ary[2] = "#{bucket}.#{host}"
+      link_ary.delete_at(3)
+      link_ary.join("/")
+    end
+    
+    def output(str)
+      @file.write "#{str}\n" if @file
+      p str
+    end
+
+    def add_style
+      output "<style>"
+      output( "body {min-width: 600px; margin:0; padding:0; font-size:70.5%; /* font-family:'Lucida Sans', Verdana, Arial, sans-serif; */ font-family:'Lucida Grande','Lucida Sans Unicode','Lucida Sans',Verdana,lucida,sans-serif; background:#FFF; height:100%}
+    html {height:100%}
+    a img {border:none}
+    a {color:#1e4a7e}
+    table { width:90% }
+    th { text-align:center }
+
+    #header {
+    	background:#235186; 
+    	padding:2px 20px; 
+    	position:relative; 
+    	height:25px;
+    }
+
+    #header #logo {
+    	margin-top:3px; 
+    }
+
+    .common {
+      font-size: 16px;
+      margin-left:auto;
+      margin-right:auto;
+      font-weight: bold;
+    	padding:2px 20px; 
+    	position:relative; 
+    }
+
+    .bucket {
+      font-size: 24px;
+      color: #F5F2A9;
+    	background:#235186; 
+    	padding:10px 30px 20px; 
+    }
+   
+    .version {
+      color: #F5F2A9;
+    	background:#235186; 
+    }
+
+    .hypervisor {
+      color: #235186;
+    	background:#F5F2A9; 
+    }
+
+    .platform {
+    	background: #FFFFFF;
+    	width:90%;
+    	margin-left: auto ;
+      margin-right: auto ;
+      position: relative;
+    }
+    
+    .disclaimer {
+    	background: #FFFFFF;
+    	width:90%;
+    	margin-left: auto ;
+      margin-right: auto ;
+      position: relative;
+      border: 2px solid black;
+      font-weight: normal;
+    }
+    
+    .code {
+    	font-family:'Courier New', monospace;
+    	color: #000000;
+    	position:relative;
+    	left:10px;
+    }
+    ")
+      output "</style>"
+    end
+    
+    def encoded_logo
+      "data:image/png;base64,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%3D%3D"
+    end
+  
+  end
+end
+
+
+  

data/lib/util.rb

@@ -0,0 +1,50 @@
+module RightImage
+
+  RELEASE_LEVELS = ["Alpha", "Beta", "Ga"]
+  HIDDEN_RELEASE_LEVELS = [ "Ga" ]
+
+  class Util
+    
+    def self.create_image_name(image_prefix, os_name, os_version, os_arch, os_modifier, right_image_version, right_image_build = nil, image_build_number = nil, storage_type = nil, release_level = nil, suffix = nil)
+
+      image_name = "#{image_prefix}_#{os_name}_#{os_version.to_s}_#{os_arch}"
+
+      unless os_modifier.nil? || os_modifier.empty?
+        image_name << "_#{os_modifier}"
+      end
+
+      package_version = rightimage_version(right_image_version, right_image_build, image_build_number)
+      image_name << "_v#{package_version}"
+      image_name << "_#{storage_type}" if storage_type && storage_type.downcase != "s3"
+
+      if release_level
+        level = release_level.capitalize
+        raise "ERROR: release_level must be set to 'Alpha', 'GA', or 'Beta'" unless RELEASE_LEVELS.include?(level)
+        image_name << "_#{level}" unless HIDDEN_RELEASE_LEVELS.include?(level)
+      end
+
+      image_name << "_#{suffix.capitalize}" if suffix
+
+      image_name
+    end    
+    
+    def self.rightimage_package_version(version, build_number=nil)
+      raise "ERROR: version must be a 'N.N' format." unless version.to_s =~ /^[0-9]*\.[0-9]*$/
+      ver = "#{version.to_s}"
+      ver << ".#{build_number}" if build_number
+      ver
+    end
+
+    def self.rightimage_version(package_version, package_build=nil, image_build = nil)
+      ver = rightimage_package_version(package_version, package_build)
+      ver << ".#{image_build}" unless image_build == 0 || image_build == nil
+      ver
+    end
+
+    def self.create_mci_name(image_prefix, os_name, os_version, os_arch, os_modifier, right_image_version, storage_type = nil, release_level = nil, suffix = nil)
+      create_image_name(image_prefix, os_name, os_version, os_arch, os_modifier, right_image_version, nil, nil, storage_type, release_level, suffix)
+    end
+      
+      
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightimage_tools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Peter Schroeter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
   requirement: *id002
   prerelease: false
-  name: ruby-debug
+  name: right_aws
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -123,26 +123,29 @@ dependencies:
   type: :development
 description: A set of tools to support the building of RightImages
 email: peter.schroeter@rightscale.com
-executables: []
-
+executables: 
+- image_mover
+- mci_merge
+- update_s3_index
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
 files: 
-- .document
-- .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/image_mover
+- bin/mci_merge
+- bin/update_s3_index
+- lib/id_list.rb
 - lib/mci.rb
 - lib/rightimage_tools.rb
-- spec/mci_spec.rb
-- spec/spec_helper.rb
+- lib/s3_html_indexer.rb
+- lib/util.rb
 homepage: http://github.com/rightscale/rightimage_tools
 licenses: 
 - MIT

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Gemfile.lock

@@ -1,50 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (2.3.10)
-    columnize (0.3.4)
-    diff-lcs (1.1.3)
-    flexmock (0.9.0)
-    git (1.2.5)
-    highline (1.6.2)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    net-ssh (2.1.4)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    rcov (1.0.0)
-    rest_connection (0.1.2)
-      activesupport (= 2.3.10)
-      highline
-      json
-      net-ssh (= 2.1.4)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  flexmock
-  jeweler (~> 1.6.4)
-  rcov
-  rest_connection
-  rspec (~> 2.3.0)
-  ruby-debug

data/spec/mci_spec.rb

@@ -1,97 +0,0 @@
-require 'flexmock/rspec'
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe RightImageTools::MCI do
-
-  before :each do 
-    @mci = RightImageTools::MCI.new
-
-    @mock_mci_name = "Mock_RightImage_Ubuntu_10.04_x64_v5.7" 
-    @mock_ami = "ami-2ehahaha"
-
-    @mock_mci = flexmock(MultiCloudImage, 
-      :is_head_version => true, 
-      :name => @mock_mci_name,
-      :rs_id => "10000", 
-      :version=>0, 
-      :href=>"https://my.rightscale.com/api/acct/99999/multi_cloud_images/10000")
-
-    @mock_mci_setting1 = flexmock(MultiCloudImageCloudSettingInternal,
-      :href=>"https://my.rightscale.com/api/acct/99999/multi_cloud_image_cloud_settings/20000", 
-      :aws_instance_type =>"m1.large", 
-      :image_name => @mock_mci_name,
-      :image_href => "https://my.rightscale.com/api/acct/0/ec2_images/#{@mock_ami}?cloud_id=5",
-      :cloud_id=>5,
-      :cloud=>"AWS AP-Tokyo")
-
-    @mock_mci_i = flexmock(MultiCloudImageInternal, 
-      :is_head_version => @mock_mci.is_head_version, 
-      :name=>@mock_mci.name,
-      :rs_id => @mock_mci.rs_id, 
-      :version=>@mock_mci.version, 
-      :href=>@mock_mci.href,
-      :multi_cloud_image_cloud_settings=>[@mock_mci_setting1])
-  end
-
-#  it "finds a MCI for gateway cloud (cloudstack)" do
-#    pending "TODO"
-#  end
-#  it "creates a MCI for gateway cloud (cloudstack)" do
-#    pending "TODO"
-#  end
-#  it "associates an image for a gateway cloud (cloudstack)" do 
-#    pending "TODO"
-#  end
-#  it "replaces an image association for a gateway cloud (cloudstack)" do 
-#    pending "TODO"
-#  end
-#
-  it "finds a MCI for EC2 cloud" do
-    flexmock(MultiCloudImage).should_receive(:find_all).and_return([@mock_mci])
-    flexmock(MultiCloudImageInternal).should_receive(:find).with(10000).and_return(@mock_mci_i)
-  
-    @mci.find_mci(6, @mock_mci_name).rs_id.should == "10000"
-  end
-  it "creates a MCI for EC2 mock cloud" do
-    flexmock(MultiCloudImageInternal).should_receive(:create).with(
-      :name=>@mock_mci_name,
-      :description => "blah"
-    ).and_return(flexmock(MultiCloudImageInternal))
-    @mci.create_mci(6, @mock_mci_name, "blah")
-  end
-
-  it "associates an image to an EC2 cloud" do 
-    flexmock(MultiCloudImage).should_receive(:find_all).and_return([@mock_mci])
-    flexmock(MultiCloudImageInternal).should_receive(:find).with(10000).and_return(@mock_mci_i)
-    flexmock(Tag).should_receive(:set).and_return(flexmock(Tag, :code=>"204"))
-    flexmock(MultiCloudImageCloudSettingInternal).should_receive(:create)
-
-    @mci.add_image_to_mci(
-      :cloud_id=>6,
-      :name=>@mock_mci_name,
-      :image_id=>"ami-b1ahb1ah")
-  end
-
-  it "replaces an image association for an EC2 cloud" do 
-    flexmock(MultiCloudImage).should_receive(:find_all).and_return([@mock_mci])
-    flexmock(MultiCloudImageInternal).should_receive(:find).with(10000).and_return(@mock_mci_i)
-    flexmock(Tag).should_receive(:set).and_return(flexmock(Tag, :code=>"204"))
-    flexmock(MultiCloudImageCloudSettingInternal).should_receive(:destroy).and_return(flexmock("Response",:code=>"200"))
-    flexmock(MultiCloudImageCloudSettingInternal).should_receive(:create)
-
-    @mci.add_image_to_mci(
-      :cloud_id=>5,
-      :name=>@mock_mci_name,
-      :image_id=>"ami-b1ahb1ah")
-  end
-
-  it "sets a default description correctly" do
-    flexmock(MultiCloudImageInternal).should_receive(:create).with(
-      :name=>@mock_mci_name,
-      :description => "Development build: Ubuntu 10.04 with 64-bit architecture (x64) and RightLink 5.7." 
-    ).and_return(@mock_mci)
-
-    @mci.create_mci(5, @mock_mci_name)
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,13 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'rightimage_tools'
-
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.mock_with :flexmock
-end