studio_api 3.1.0 → 3.1.1

data/test/running_build_test.rb

@@ -1,50 +1,58 @@
-require 'rubygems'
-require 'active_support'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
-$:.unshift File.join( File.dirname(__FILE__), '..', 'lib')
-require 'studio_api/running_build'
-require 'studio_api/connection'
+require 'test_helper'
 
 class RunningBuildTest < Test::Unit::TestCase
-  BUILD_ID = 529783
-  APPLIANCE_ID = 269186
-
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__), "responses", name))
-  end
 
   def setup
-    @connection = StudioApi::Connection.new("test", "test", "http://localhost")
-    StudioApi::RunningBuild.studio_connection = @connection
+    @build_id = 529783
+    @appliance_id = 269186
 
-    running_builds_out = respond_load "running_builds.xml"
-    running_build_out = respond_load "running_build.xml"
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+    StudioApi::RunningBuild.studio_connection = @connection
+  end
 
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/running_builds?appliance_id=#{APPLIANCE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, running_builds_out, 200
-      mock.get "/running_builds/#{BUILD_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, running_build_out, 200
-      mock.delete "/running_builds/#{BUILD_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, running_build_out, 200
-      mock.post "/running_builds?appliance_id=#{APPLIANCE_ID}&force=true", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, running_build_out, 200
-    end
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
-    res = StudioApi::RunningBuild.find :all, :params => {:appliance_id => APPLIANCE_ID}
+    register_fake_response_from_file :get, "/api/running_builds?appliance_id=#{@appliance_id}",
+                                     'running_builds.xml'
+    res = StudioApi::RunningBuild.find :all, :params => {:appliance_id => @appliance_id}
     assert_equal 3, res.size
-    res = StudioApi::RunningBuild.find BUILD_ID
-    assert_equal BUILD_ID, res.id.to_i
+
+    register_fake_response_from_file :get, "/api/running_builds/#{@build_id}",
+                                     'running_build.xml'
+    res = StudioApi::RunningBuild.find @build_id
+    assert_equal @build_id, res.id.to_i
   end
 
   def test_cancel
-    running_build = StudioApi::RunningBuild.find BUILD_ID
+    register_fake_response_from_file :get, "/api/running_builds/#{@build_id}",
+                                     'running_build.xml'
+    running_build = StudioApi::RunningBuild.find @build_id
+
+    register_fake_response_from_file :delete, "/api/running_builds/#{@build_id}",
+                                     'running_build.xml'
     assert running_build.destroy
-    assert StudioApi::RunningBuild.delete BUILD_ID
+    assert StudioApi::RunningBuild.delete @build_id
     assert running_build.cancel #test alias
   end
 
   def test_run_new
-    assert StudioApi::RunningBuild.new(:appliance_id => APPLIANCE_ID, :force => true).save
+    register_fake_response_from_file :post, "/api/running_builds?appliance_id=#{@appliance_id}&force=true",
+                                     'running_build.xml'
+    assert StudioApi::RunningBuild.new(:appliance_id => @appliance_id, :force => true).save
+  end
+
+  def test_find_image_already_exists_error
+    register_fake_response_from_file :post, "/api/running_builds?appliance_id=#{@appliance_id}",
+                                     'running_build_image_already_exists.xml',
+                                     ["400", "Bad Request"]
+
+    assert_raises StudioApi::ImageAlreadyExists do
+      StudioApi::RunningBuild.new(:appliance_id => @appliance_id).save
+    end
   end
 end

data/test/template_set_test.rb

@@ -1,32 +1,21 @@
-require 'rubygems'
-require 'active_support'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
-require 'tempfile'
-$:.unshift File.join( File.dirname(__FILE__), '..', 'lib')
-require 'studio_api/template_set'
-require 'studio_api/connection'
-require 'studio_api/generic_request'
+require 'test_helper'
 
 class TemplateSetTest < Test::Unit::TestCase
 
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__), "responses", name))
-  end
-
   def setup
-    @connection = StudioApi::Connection.new("test", "test", "http://localhost")
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
     StudioApi::TemplateSet.studio_connection = @connection
+  end
 
-    template_sets_out = respond_load "template_sets.xml"
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/template_sets", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, template_sets_out, 200
-    end
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
+    register_fake_response_from_file :get, "/api/template_sets",
+                                     'template_sets.xml'
     res = StudioApi::TemplateSet.find :all
     assert_equal 6, res.size
     assert_equal 42, res[0].template.size

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../lib/studio_api',__FILE__)
+
+require 'fakeweb'
+require 'mocha'
+require 'test/unit'
+
+class Test::Unit::TestCase
+  @@username = "foo"
+  @@password = "api_password"
+  private
+
+  def register_fake_response request_type, request, response,
+                             status = ["200", "OK"]
+    url = "http://#{@@username}:#{@@password}@localhost#{request}"
+    FakeWeb.register_uri(request_type, url, :body => response, :status => status)
+  end
+
+  def register_fake_response_from_file request_type, request, response_file_name,
+                                       status = ["200", "OK"]
+    response = IO.read(File.join(File.dirname(__FILE__),"responses",
+                                 response_file_name))
+    register_fake_response request_type, request, response, status
+  end
+end
+

data/test/testdrive_test.rb

@@ -1,38 +1,25 @@
-require 'rubygems'
-require 'active_support'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
-$:.unshift File.join( File.dirname(__FILE__), '..', 'lib')
-require 'studio_api/testdrive'
-require 'studio_api/connection'
+require 'test_helper'
 
 class TestdriveTest < Test::Unit::TestCase
-  BUILD_ID = 12345
-
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__), "responses", name))
-  end
-
   def setup
-    @connection = StudioApi::Connection.new("test", "test", "http://localhost")
-    StudioApi::Testdrive.studio_connection = @connection
-
-    testdrives_out = respond_load "testdrives.xml"
-    testdrive_out = respond_load "testdrive.xml"
+    @build_id = 12345
 
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/testdrives", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, testdrives_out, 200
-      mock.post "/testdrives?build_id=#{BUILD_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, testdrive_out, 200
-    end
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+    StudioApi::Testdrive.studio_connection = @connection
   end
 
   def test_find
-    res = StudioApi::Testdrive.all
+    register_fake_response_from_file :get, "/api/testdrives",
+                                     'testdrives.xml'
+    res = StudioApi::Testdrive.find :all
     assert_equal 1, res.size
   end
 
   def test_new
-    assert StudioApi::Testdrive.new(:build_id => BUILD_ID).save
+    register_fake_response_from_file :post, "/api/testdrives?build_id=#{@build_id}",
+                                     'testdrive.xml'
+    assert StudioApi::Testdrive.new(:build_id => @build_id).save
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: studio_api
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Josef Reidinger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,21 +50,37 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |-
   Studio Api makes it easier to use SuSE Studio (http://susestudio.com) via API.
-                  Instead of adapting each ActiveResource to its behavior and
-                  manually adding multipart file upload it wrapp in in Active
-                  Resource like interface. It is possible to define credentials
-                  for whole api, or use it per partes, so it allow using it for
-                  different studio users together.
+              Instead of adapting each ActiveResource to its behavior and
+              manually adding multipart file upload it wrapp in in Active
+              Resource like interface. It is possible to define credentials
+              for whole api, or use it per partes, so it allow using it for
+              different studio users together.
 email: jreidinger@suse.cz
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
+- .gitignore
+- Gemfile
 - README
 - Rakefile
 - VERSION
@@ -85,6 +101,8 @@ files:
 - lib/studio_api/template_set.rb
 - lib/studio_api/testdrive.rb
 - lib/studio_api/util.rb
+- rubygem-studio_api.changes
+- rubygem-studio_api.spec.template
 - test/appliance_test.rb
 - test/build_test.rb
 - test/connection_test.rb
@@ -93,10 +111,7 @@ files:
 - test/generic_request_test.rb
 - test/repository_test.rb
 - test/resource_test.rb
-- test/rpm_test.rb
-- test/running_build_test.rb
-- test/template_set_test.rb
-- test/testdrive_test.rb
+- test/responses/api_version.xml
 - test/responses/appliance.xml
 - test/responses/appliances.xml
 - test/responses/build.xml
@@ -114,8 +129,10 @@ files:
 - test/responses/rpm.xml
 - test/responses/rpms.xml
 - test/responses/running_build.xml
+- test/responses/running_build_image_already_exists.xml
 - test/responses/running_builds.xml
 - test/responses/software.xml
+- test/responses/software_fake_response.xml
 - test/responses/software_installed.xml
 - test/responses/software_search.xml
 - test/responses/status-broken.xml
@@ -127,6 +144,11 @@ files:
 - test/responses/users_1.xml
 - test/responses/users_2.xml
 - test/responses/versions.xml
+- test/rpm_test.rb
+- test/running_build_test.rb
+- test/template_set_test.rb
+- test/test_helper.rb
+- test/testdrive_test.rb
 has_rdoc: true
 homepage: http://github.com/jreidinger/studio_api
 licenses: 
@@ -136,7 +158,7 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --main
-- README.rdoc
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -153,14 +175,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.5.1
+rubyforge_project: studio_api
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Intuitive ruby bindings to Studio Api Interface.
@@ -173,6 +197,7 @@ test_files:
 - test/generic_request_test.rb
 - test/repository_test.rb
 - test/resource_test.rb
+- test/responses/api_version.xml
 - test/responses/appliance.xml
 - test/responses/appliances.xml
 - test/responses/build.xml
@@ -190,8 +215,10 @@ test_files:
 - test/responses/rpm.xml
 - test/responses/rpms.xml
 - test/responses/running_build.xml
+- test/responses/running_build_image_already_exists.xml
 - test/responses/running_builds.xml
 - test/responses/software.xml
+- test/responses/software_fake_response.xml
 - test/responses/software_installed.xml
 - test/responses/software_search.xml
 - test/responses/status-broken.xml
@@ -206,4 +233,5 @@ test_files:
 - test/rpm_test.rb
 - test/running_build_test.rb
 - test/template_set_test.rb
+- test/test_helper.rb
 - test/testdrive_test.rb