rightimage_tools 0.2.0 → 0.2.1

data/Rakefile

@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |gem|
   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.files = %w(LICENSE.txt VERSION README.rdoc Rakefile Gemfile) + FileList["{bin,lib,spec}/**/*"].to_a
   gem.executables = %w(image_mover mci_merge update_s3_index)
   gem.description = gem.summary
   gem.email = "peter.schroeter@rightscale.com"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/util.rb

@@ -29,7 +29,10 @@ module RightImage
     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]*$/
+      unless version.to_s =~ /^[0-9]*\.[0-9]*$/ or
+             version.to_s =~ /^2\d\d\d\.\d\d.\d\d$/
+        raise ArgumentError, "rightimage version must be a 'N.N' or 'YYYY.MM.DD' format." 
+      end
       ver = "#{version.to_s}"
       ver << ".#{build_number}" if build_number
       ver
@@ -47,4 +50,4 @@ module RightImage
       
       
   end
-end
+end

data/spec/id_list_spec.rb

@@ -0,0 +1,30 @@
+require 'flexmock/rspec'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe RightImage::IdList do
+  before(:each) do
+    mock_logger = flexmock('Logger')
+    mock_logger.should_receive(:info)
+
+    @id_list = RightImage::IdList.new(mock_logger)
+    @id_list.clear
+    #{"ami-96f200ff":{"storage_type":"EBS"},"ami-8af200e3":{}}
+    #{"ami-08f30161":{"storage_type":"EBS"},"ami-fcf20095":{"storage_type":"EBS"}}
+    @id_list.add("ami-8af200e3\n")
+
+    @id_list = RightImage::IdList.new(mock_logger)
+    @id_list.add("ami-foo\n", "EBS")
+
+    @images = @id_list.to_hash
+  end
+
+  it "should contain two images" do
+    @images.size.should == 2
+  end
+
+  it "should contain one EBS images" do
+    ebs_images = @images.select { |k, v| v["storage_type"] && v["storage_type"] == "EBS" }
+    ebs_images.size.should == 1
+  end
+
+end

data/spec/mci_spec.rb

@@ -0,0 +1,97 @@
+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.opts

@@ -0,0 +1,2 @@
+--colour
+--format=nested

data/spec/spec_helper.rb

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

data/spec/util_spec.rb

@@ -0,0 +1,254 @@
+require 'flexmock/rspec'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+PREFIX = "image_prefix"
+OS_NAME = "os_name"
+OS_VERSION = "os_version"
+OS_ARCH = "os_arch"
+OS_MODIFER = "os_modifier"
+STORAGE_TYPE = "storage_type"
+RELEASE_LEVEL = "Beta"
+RIGHT_IMAGE_VERSION = "1.20"
+SUFFIX = "suffix"
+
+
+describe RightImage::Util, ".create_mci_name" do
+  before(:each) do
+
+    @name = RightImage::Util.create_mci_name(PREFIX,
+          OS_NAME,
+          OS_VERSION,
+          OS_ARCH ,
+          OS_MODIFER,
+          "1.20",
+          STORAGE_TYPE,
+          RELEASE_LEVEL, SUFFIX)
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should display two digit version number" do
+    (@name =~ /_v[0-9]\.[0-9][0-9]/).should_not == nil
+  end
+
+  it "should display prefix" do
+    @name.include?(PREFIX).should == true
+  end
+
+  it "should display OS_NAME" do
+    @name.include?(OS_NAME).should == true
+  end
+
+  it "should display OS_VERSION" do
+    @name.include?(OS_VERSION).should == true
+  end
+
+  it "should display OS_ARCH" do
+    @name.include?(OS_ARCH).should == true
+  end
+
+  it "should display OS_MODIFER" do
+    @name.include?(OS_MODIFER).should == true
+  end
+
+  it "should display RIGHT_IMAGE_VERSION" do
+    @name.include?(RIGHT_IMAGE_VERSION.to_s).should == true
+  end
+
+  it "should display STORAGE_TYPE" do
+    @name.include?(STORAGE_TYPE).should == true
+  end
+
+  it "should display RELEASE_LEVEL" do
+    @name.include?(RELEASE_LEVEL).should == true
+  end
+
+  it "should display SUFFIX" do
+    @name.include?(SUFFIX.capitalize).should == true
+  end
+end
+
+describe RightImage::Util, ".create_mci_name S3" do
+  before(:each) do
+    @name = RightImage::Util.create_mci_name(PREFIX,
+          OS_NAME,
+          OS_VERSION,
+          OS_ARCH ,
+          OS_MODIFER,
+          1.20,
+          "S3",
+          RELEASE_LEVEL, SUFFIX)
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should not display S3" do
+    @name.include?("S3").should_not == true
+  end
+end
+
+
+describe RightImage::Util, ".create_mci_name GA" do
+
+  before(:each) do
+    @name = RightImage::Util.create_mci_name(PREFIX,
+          OS_NAME,
+          OS_VERSION,
+          OS_ARCH ,
+          OS_MODIFER,
+          1.20,
+          STORAGE_TYPE,
+          "GA", SUFFIX)
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should not display GA" do
+    @name.include?("GA").should_not == true
+  end
+end
+
+describe RightImage::Util, "rightimage_version" do
+
+  it "should display two digit version number" do
+    @version = RightImage::Util.rightimage_version(4.3)
+    (@version =~ /^[0-9]\.[0-9]$/).should_not == nil
+  end
+
+  it "should display three digit version number" do
+    @version = RightImage::Util.rightimage_version(4.3, 2)
+    (@version =~ /^[0-9]\.[0-9]\.[0-9]$/).should_not == nil
+  end
+
+  it "should display four digit version number" do
+    @version = RightImage::Util.rightimage_version(4.3, 2, 1)
+    (@version =~ /^[0-9]\.[0-9]\.[0-9]\.[0-9]$/).should_not == nil
+  end
+
+  it "should hide fourth digit if zero" do
+    @version = RightImage::Util.rightimage_version(4.3, 2, 0)
+    (@version =~ /^[0-9]\.[0-9]\.[0-9]$/).should_not == nil
+  end
+
+  it "should fail if version is N.N.N format" do
+    lambda {
+      @version = RightImage::Util.rightimage_version("4.3.5")
+    }.should raise_error(Exception)
+  end
+
+  it "should fail if version is N format" do
+    lambda {
+      @version = RightImage::Util.rightimage_version(4)
+    }.should raise_error(Exception)
+  end
+
+end
+
+describe RightImage::Util, ".create_image_name GA" do
+
+  before(:each) do
+    @name = RightImage::Util.create_image_name("RightImage", \
+          "osname", \
+          "9.10", \
+          "x64", \
+          nil, \
+          1.20, \
+          3, \
+          0,
+          "S3",
+          "GA")
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should display a three digit version number without zero build digit" do
+    (@name =~ /_v[0-9]\.[0-9]\.[0-9]/).should_not == nil
+  end
+
+  it "should display version number without 4th build digit" do
+    (@name =~ /_v[0-9]\.[0-9]\.[0-9]\.0/).should == nil
+  end
+
+  it "should not display GA" do
+    @name.include?("GA").should == false
+  end
+
+  it "should not display S3" do
+    @name.include?("S3").should == false
+  end
+
+  it "should display RightImage" do
+    @name.include?("RightImage").should == true
+  end
+
+  it "should include trailing zero on version number" do
+    @name.include?("9.10").should == true
+  end
+end
+
+describe RightImage::Util, ".create_image_name Beta EBS" do
+  before(:each) do
+    @name = RightImage::Util.create_image_name("RightImage", \
+          "osname", \
+          "99.99", \
+          "x64", \
+          nil, \
+          1.2, \
+          3, \
+          4,
+          "EBS",
+          "Beta")
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should display a four digit version number" do
+    (@name =~ /_v[0-9]\.[0-9]\.[0-9]\.[0-9]/).should_not == nil
+  end
+
+  it "should display Beta" do
+    @name.include?("Beta").should == true
+  end
+
+  it "should display EBS" do
+    @name.include?("EBS").should == true
+  end
+end
+
+describe RightImage::Util, ".create_image_name Alpha S3 Dev" do
+  before(:each) do
+    @name = RightImage::Util.create_image_name("RightImage", \
+          "osname", \
+          "99.99", \
+          "x64", \
+          nil, \
+          1.2, \
+          3, \
+          4,
+          "EBS",
+          "Alpha",
+          "dev0")
+  end
+
+  it "should not have any blank fields" do
+    @name.include?("__").should == false
+  end
+
+  it "should display Alpha" do
+    @name.include?("Alpha").should == true
+  end
+
+  it "should display capitalized dev0" do
+    @name.include?("Dev0").should == true
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightimage_tools
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Peter Schroeter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -146,6 +146,11 @@ files:
 - lib/rightimage_tools.rb
 - lib/s3_html_indexer.rb
 - lib/util.rb
+- spec/id_list_spec.rb
+- spec/mci_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/util_spec.rb
 homepage: http://github.com/rightscale/rightimage_tools
 licenses: 
 - MIT