tim 0.1.2 → 0.2.0

data/spec/models/template_spec.rb

@@ -6,11 +6,20 @@ module Tim
       it 'should have many base images' do
         template = FactoryGirl.build(:template)
         2.times do
-          template.base_images << BaseImage.new
+          template.base_images << FactoryGirl.build(:base_image)
         end
         template.save!
         Template.find(template).base_images.size.should == 2
       end
     end
+
+    describe "XML helper methods" do
+      it 'should return os struct' do
+        os = FactoryGirl.build(:template).os
+        os.name.should == 'Fedora'
+        os.version.should == '15'
+        os.arch.should == 'x86_64'
+      end
+    end
   end
-end
+end

data/spec/validators/template_validator_spec.rb

@@ -15,5 +15,15 @@ module Tim
       TemplateValidator.new({}).validate(template)
       template.errors.size.should > 0
     end
+
+    it "should add xml syntax errors to template errors" do
+      template = FactoryGirl.build(:template,
+                                   :xml => "<invalid_template>
+                                            </invalid_template")
+      TemplateValidator.new({}).validate(template)
+      template.errors.size.should > 0
+      template.errors.messages.first.to_s
+        .include?("Syntax error on line 2").should == true
+    end
   end
 end

data/spec/views/base_images_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 module Tim
   describe "/tim/base_images/_base_image" do
     before(:each) do
-      view.stub(:base_image).and_return FactoryGirl.create(:base_image)
+      view.stub(:base_image).and_return FactoryGirl.create(:base_image_with_template)
       view.stub(:base_image_url)
+      view.stub(:template_url)
     end
 
     it "should render custom content partial when it is defined" do

data/spec/views/provider_images_spec.rb

@@ -7,6 +7,7 @@ module Tim
         .stub(:create_factory_target_image)
       Tim::TargetImage.any_instance.stub(:template)
         .and_return FactoryGirl.build(:template)
+      Tim::TargetImage.any_instance.stub(:imported?).and_return(false)
 
       view.stub(:provider_image).and_return FactoryGirl.build(:provider_image)
       [:provider_image_url, :target_image_url].each do |method|

data/test/dummy/app/decorators/tim/controllers/base_images_controller_decorator.rb

@@ -0,0 +1,13 @@
+Tim::BaseImagesController.class_eval do
+  before_filter :set_test_location, :only => :respond_options_test
+
+  def respond_options_test
+    @base_image = Tim::BaseImage.find(params[:id]) unless defined? @base_image
+    respond_with(@base_image, @respond_options)
+  end
+
+  private
+  def set_test_location
+    @respond_options = {:location => tim.templates_path}
+  end
+end

data/test/dummy/config/database.yml

@@ -23,6 +23,3 @@ production:
   database: db/production.sqlite3
   pool: 5
   timeout: 5000
-
-cucumber:
-  <<: *test

data/test/dummy/config/initializers/tim.rb

@@ -5,4 +5,4 @@ Tim.provider_type_class = "ProviderType"
 Tim::ImageFactory::Base.site = "http://localhost:8075/imagefactory"
 # FIXME: We should be able to infer these from Routes
 Tim::ImageFactory::TargetImage.callback_url = "http://localhost:3000/tim/target_images/"
-Tim::ImageFactory::ProviderImage.callback_url = "http://localhost:3000/tim/provider_images/"
+Tim::ImageFactory::ProviderImage.callback_url = "http://localhost:3000/tim/provider_images/"

data/test/dummy/config/routes.rb

@@ -1,4 +1,9 @@
 Rails.application.routes.draw do
 
   mount Tim::Engine => "/tim"
-end
+
+  # respond_options test path
+  scope :module => "tim" do
+    match "/respond_options_test/:id" => "base_images#respond_options_test"
+  end 
+end

data/test/dummy/db/migrate/20121216133232_add_provider_account_id_to_provider_images.rb

@@ -0,0 +1,5 @@
+class AddProviderAccountIdToProviderImages < ActiveRecord::Migration
+  def change
+    add_column :tim_provider_images, :provider_account_id, :integer
+  end
+end

data/test/dummy/db/schema.rb

@@ -13,21 +13,38 @@
 
 ActiveRecord::Schema.define(:version => 20120423123114264114) do
 
+  create_table "pool_families", :force => true do |t|
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "provider_accounts", :force => true do |t|
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "provider_types", :force => true do |t|
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "tim_base_images", :force => true do |t|
     t.string   "name"
     t.string   "description"
     t.integer  "template_id"
     t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
     t.integer  "pool_family_id"
+    t.boolean  "import",         :default => false
   end
 
   create_table "tim_image_versions", :force => true do |t|
     t.integer  "base_image_id"
     t.integer  "template_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at",            :null => false
+    t.datetime "updated_at",            :null => false
+    t.string   "factory_base_image_id"
   end
 
   create_table "tim_provider_images", :force => true do |t|
@@ -35,13 +52,14 @@ ActiveRecord::Schema.define(:version => 20120423123114264114) do
     t.integer  "target_image_id"
     t.string   "provider"
     t.string   "external_image_id"
-    t.string   "provider_account_id"
+    t.string   "factory_provider_account_id"
     t.boolean  "snapshot"
     t.string   "status"
     t.string   "status_detail"
     t.string   "progress"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "provider_account_id"
   end
 
   create_table "tim_target_images", :force => true do |t|
@@ -51,9 +69,10 @@ ActiveRecord::Schema.define(:version => 20120423123114264114) do
     t.string   "status"
     t.string   "status_detail"
     t.string   "progress"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
     t.integer  "provider_type_id"
+    t.string   "build_method",     :default => "BARE_METAL"
   end
 
   create_table "tim_templates", :force => true do |t|
@@ -62,21 +81,6 @@ ActiveRecord::Schema.define(:version => 20120423123114264114) do
     t.datetime "updated_at", :null => false
   end
 
-  create_table "pool_families", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "provider_accounts", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "provider_types", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "name"
     t.datetime "created_at", :null => false

data/tim.gemspec

@@ -0,0 +1,32 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "tim/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "tim"
+  s.version     = Tim::VERSION
+  s.authors     = ["Martyn Taylor", "Jason Guiditta"]
+  s.email       = ["aeolus-devel@lists.fedorahosted.org"]
+  s.homepage    = "https://github.com/aeolus-incubator/tim"
+  s.license     = 'MIT'
+  s.summary     = "Embeddable client for Aeolus Image Factory"
+  s.description = "Rails engine client for the Aeolus Image Factory cross-cloud virtual machine image builder."
+
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc", "tim.gemspec", "Gemfile"]
+  s.test_files = Dir["{spec,test}/**/*"]
+  s.test_files.reject! { |fn| fn.match(/sqlite|tmp|log/) }
+
+  s.add_dependency "rails", "~> 3.2"
+  s.add_dependency "haml"
+  s.add_dependency "nokogiri"
+
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "factory_girl_rails", "~> 4.1.0"
+  s.add_development_dependency "minitest"
+
+  #s.add_development_dependency "jquery-rails"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tim
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &9234960 !ruby/object:Gem::Requirement
+  requirement: &8009320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *9234960
+  version_requirements: *8009320
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &9234280 !ruby/object:Gem::Requirement
+  requirement: &8007020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9234280
+  version_requirements: *8007020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9233440 !ruby/object:Gem::Requirement
+  requirement: &8006340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9233440
+  version_requirements: *8006340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &9124240 !ruby/object:Gem::Requirement
+  requirement: &8018880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9124240
+  version_requirements: *8018880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &9123620 !ruby/object:Gem::Requirement
+  requirement: &8016220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9123620
+  version_requirements: *8016220
 - !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: &9122800 !ruby/object:Gem::Requirement
+  name: database_cleaner
+  requirement: &8026240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,21 +77,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9122800
+  version_requirements: *8026240
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: &9121700 !ruby/object:Gem::Requirement
+  name: factory_girl_rails
+  requirement: &8035500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
   type: :development
   prerelease: false
-  version_requirements: *9121700
+  version_requirements: *8035500
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: &9121140 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &8865100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9121140
+  version_requirements: *8865100
 description: Rails engine client for the Aeolus Image Factory cross-cloud virtual
   machine image builder.
 email:
@@ -170,8 +170,10 @@ files:
 - app/views/tim/base_images/index.xml.haml
 - app/views/tim/base_images/_base_image_minimal.xml.haml
 - app/helpers/tim/application_helper.rb
+- app/exceptions/tim/exceptions.rb
 - app/assets/javascripts/tim/application.js
 - app/assets/stylesheets/tim/application.css
+- app/filters/tim/resource_link_filter.rb
 - app/filters/tim/user_keys_filter.rb
 - app/models/tim/provider_image.rb
 - app/models/tim/template.rb
@@ -180,15 +182,20 @@ files:
 - app/models/tim/target_image.rb
 - app/models/tim/image_version.rb
 - app/responders/tim/custom_responder.rb
+- app/patches/rails/active_record/autosave_association.rb
 - config/user_keys.yml
 - config/routes.rb
 - config/initializers/haml.rb
 - config/cucumber.yml
 - config/schemas/tdl.rng
+- db/migrate/20121216134538_add_factory_base_image_id_to_image_versions.rb
 - db/migrate/20120906180351_create_tim_base_images.rb
+- db/migrate/20121115151914_add_import_to_tim_base_images.rb
 - db/migrate/20120906210106_create_tim_image_versions.rb
+- db/migrate/20121216131814_rename_provider_account_id_attribute.rb
 - db/migrate/20120911202321_create_tim_target_images.rb
 - db/migrate/20120911204329_create_tim_provider_images.rb
+- db/migrate/20121210131423_add_build_method_to_target_image.rb
 - db/migrate/20120910175233_create_tim_templates.rb
 - lib/tasks/tim_tasks.rake
 - lib/tasks/cucumber.rake
@@ -199,12 +206,15 @@ files:
 - lib/generators/tim/install_generator.rb
 - lib/tim.rb
 - lib/image_factory/model/provider_image.rb
+- lib/image_factory/model/base_image.rb
 - lib/image_factory/model/base.rb
 - lib/image_factory/model/target_image.rb
 - lib/image_factory/image_factory.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- tim.gemspec
+- Gemfile
 - spec/controllers/base_images_controller_spec.rb
 - spec/controllers/templates_controller_spec.rb
 - spec/controllers/image_versions_controller_spec.rb
@@ -228,6 +238,7 @@ files:
 - spec/factories/tim/image_version.rb
 - spec/support/routes.rb
 - spec/filters/user_keys_filter_spec.rb
+- spec/filters/resource_link_filter_spec.rb
 - spec/models/image_version_spec.rb
 - spec/models/template_spec.rb
 - spec/models/base_image_spec.rb
@@ -255,17 +266,14 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/boot.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/db/migrate/20120326103723532622_create_users.rb
 - test/dummy/db/migrate/20120911203222_create_provider_types.rb
 - test/dummy/db/migrate/20120911182850_add_pool_family_id_to_tim_base_image.rb
 - test/dummy/db/migrate/20120911205431_create_provider_accounts.rb
 - test/dummy/db/migrate/20120423123114264114_create_pool_families.rb
+- test/dummy/db/migrate/20121216133232_add_provider_account_id_to_provider_images.rb
 - test/dummy/db/migrate/20120911202845_add_provider_type_id_to_tim_target_image.rb
-- test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/config.ru
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -284,6 +292,7 @@ files:
 - test/dummy/app/models/provider_type.rb
 - test/dummy/app/models/pool_family.rb
 - test/dummy/app/decorators/tim/controllers/templates_controller_decorator.rb
+- test/dummy/app/decorators/tim/controllers/base_images_controller_decorator.rb
 - test/dummy/script/rails
 - test/dummy/test.rb
 - test/dummy/Rakefile
@@ -291,20 +300,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/404.html
-- test/dummy/tmp/cache/assets/D89/200/sprockets%2Ff9b4e953c874ed6a87de6490d055d9db
-- test/dummy/tmp/cache/assets/CE0/690/sprockets%2F04c628c2a636286bfa92a4966b82b92a
-- test/dummy/tmp/cache/assets/D03/040/sprockets%2Fd9e94204d4b307145f12efc109b16c1f
-- test/dummy/tmp/cache/assets/D69/BD0/sprockets%2F0aaf75cf34556b33a9fec534fe4d0415
-- test/dummy/tmp/cache/assets/C7A/BB0/sprockets%2F13445f7a19078dd2df39517062aa6711
-- test/dummy/tmp/cache/assets/D06/DC0/sprockets%2Fcd282851b6e4c463409ba3ece67e0510
-- test/dummy/tmp/cache/assets/CB0/2B0/sprockets%2F79106b90879c02a115d7f6f1c8390ac4
-- test/dummy/tmp/cache/assets/C8C/CC0/sprockets%2F95d79f3b3096348427f3e4e38b5202e3
-- test/dummy/tmp/cache/assets/DF4/430/sprockets%2F403bb1de60cae4325cebd7e6c389b8ad
-- test/dummy/tmp/cache/assets/EB3/CE0/sprockets%2Fd75a89c9fffacd99bce7eed96844eafc
-- test/dummy/tmp/cache/assets/D64/3A0/sprockets%2F56ac1aed10c39b12a88cb1b30f668f58
-- test/dummy/tmp/cache/assets/D87/D80/sprockets%2Fefa3c8b210e87358c7add88cd6f49597
-- test/dummy/tmp/cache/assets/E00/500/sprockets%2Faaddc5b6f2cb6b98930cc54cf4c64a95
-- test/dummy/tmp/cache/assets/D23/5F0/sprockets%2F2a521f3183c6bbcd71bd26a5490b201e
 homepage: https://github.com/aeolus-incubator/tim
 licenses:
 - MIT
@@ -318,12 +313,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2330827430856779926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2330827430856779926
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -354,6 +355,7 @@ test_files:
 - spec/factories/tim/image_version.rb
 - spec/support/routes.rb
 - spec/filters/user_keys_filter_spec.rb
+- spec/filters/resource_link_filter_spec.rb
 - spec/models/image_version_spec.rb
 - spec/models/template_spec.rb
 - spec/models/base_image_spec.rb
@@ -381,17 +383,14 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/boot.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/db/migrate/20120326103723532622_create_users.rb
 - test/dummy/db/migrate/20120911203222_create_provider_types.rb
 - test/dummy/db/migrate/20120911182850_add_pool_family_id_to_tim_base_image.rb
 - test/dummy/db/migrate/20120911205431_create_provider_accounts.rb
 - test/dummy/db/migrate/20120423123114264114_create_pool_families.rb
+- test/dummy/db/migrate/20121216133232_add_provider_account_id_to_provider_images.rb
 - test/dummy/db/migrate/20120911202845_add_provider_type_id_to_tim_target_image.rb
-- test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/config.ru
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -410,6 +409,7 @@ test_files:
 - test/dummy/app/models/provider_type.rb
 - test/dummy/app/models/pool_family.rb
 - test/dummy/app/decorators/tim/controllers/templates_controller_decorator.rb
+- test/dummy/app/decorators/tim/controllers/base_images_controller_decorator.rb
 - test/dummy/script/rails
 - test/dummy/test.rb
 - test/dummy/Rakefile
@@ -417,17 +417,3 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/404.html
-- test/dummy/tmp/cache/assets/D89/200/sprockets%2Ff9b4e953c874ed6a87de6490d055d9db
-- test/dummy/tmp/cache/assets/CE0/690/sprockets%2F04c628c2a636286bfa92a4966b82b92a
-- test/dummy/tmp/cache/assets/D03/040/sprockets%2Fd9e94204d4b307145f12efc109b16c1f
-- test/dummy/tmp/cache/assets/D69/BD0/sprockets%2F0aaf75cf34556b33a9fec534fe4d0415
-- test/dummy/tmp/cache/assets/C7A/BB0/sprockets%2F13445f7a19078dd2df39517062aa6711
-- test/dummy/tmp/cache/assets/D06/DC0/sprockets%2Fcd282851b6e4c463409ba3ece67e0510
-- test/dummy/tmp/cache/assets/CB0/2B0/sprockets%2F79106b90879c02a115d7f6f1c8390ac4
-- test/dummy/tmp/cache/assets/C8C/CC0/sprockets%2F95d79f3b3096348427f3e4e38b5202e3
-- test/dummy/tmp/cache/assets/DF4/430/sprockets%2F403bb1de60cae4325cebd7e6c389b8ad
-- test/dummy/tmp/cache/assets/EB3/CE0/sprockets%2Fd75a89c9fffacd99bce7eed96844eafc
-- test/dummy/tmp/cache/assets/D64/3A0/sprockets%2F56ac1aed10c39b12a88cb1b30f668f58
-- test/dummy/tmp/cache/assets/D87/D80/sprockets%2Fefa3c8b210e87358c7add88cd6f49597
-- test/dummy/tmp/cache/assets/E00/500/sprockets%2Faaddc5b6f2cb6b98930cc54cf4c64a95
-- test/dummy/tmp/cache/assets/D23/5F0/sprockets%2F2a521f3183c6bbcd71bd26a5490b201e