studio_api 3.1.3 → 3.1.4

data/Rakefile

@@ -7,6 +7,18 @@ Bundler::GemHelper.install_tasks
 
 task :default => "test"
 
+desc "Create package directory containing all things to build RPM"
+task :package => [:build] do
+  pkg_name = "rubygem-studio_api"
+  include FileUtils::Verbose
+  rm_rf "package"
+  mkdir "package"
+  cp "#{pkg_name}.changes","package/"
+  cp "#{pkg_name}.spec.template","package/#{pkg_name}.spec"
+  sh 'cp pkg/*.gem package/'
+  sh "sed -i \"s:<VERSION>:`cat VERSION`:\" package/#{pkg_name}.spec"
+end
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

data/lib/studio_api/appliance.rb

@@ -24,25 +24,21 @@ module StudioApi
       self.element_name = "status"
     end
 
+    # Represent appliance configuration
+    # @example set LVM in appliance ( require rails 3 for newly initialized variables )
+    #   configuration = appliance.configuration
+    #   configuration.lvm.enabled = "true"
+    #   configuration.lvm.volume_group = "fooVG"
+    #   configuration.lvm.volumes = [ { :path => "/test", :size => "500M" } ]
+    #   configuration.save
     class Configuration < ActiveResource::Base
       extend StudioResource
       self.element_name = "configuration"
 
-      def self.parse response
-        tree = XmlSimple.xml_in(response, "ForceArray" => ["tag","user","eula","autostart","database","volume"])
-        tree["tags"] = tree["tags"]["tag"].reduce({}){ |acc,t| acc.merge :tag => t} if tree["tags"]
-        tree["users"] = tree["users"]["user"]
-        tree["eulas"] = tree["eulas"]["eula"]
-        tree["autostarts"] = tree["autostarts"]["autostart"] if tree["autostarts"]
-        if tree["databases"]
-          tree["databases"]=  tree["databases"]["database"] 
-          tree["databases"].each do |d|
-            d["users"] = d["users"]["user"] if d["users"]
-          end
-        end
-        tree["lvm"]["volumes"] = tree["lvm"]["volumes"]["volume"] if tree["lvm"] && tree["lvm"]["volumes"]
-        Firewall.studio_connection = studio_connection
-        Configuration.new tree
+      def self.find (id, prefix_options={})
+        request_str = "/appliances/#{id.to_i}/configuration"
+        response = GenericRequest.new(studio_connection).get request_str
+        Configuration.parse response
       end
 
       def update
@@ -64,6 +60,29 @@ module StudioApi
           end
         end
       end
+
+    private 
+      def self.parse response
+        tree = XmlSimple.xml_in(response, "ForceArray" => ["tag","user","eula","autostart","database","volume"])
+        tree["tags"] = tree["tags"]["tag"].reduce({}){ |acc,t| acc.merge :tag => t} if tree["tags"]
+        tree["users"] = tree["users"]["user"]
+        tree["eulas"] = tree["eulas"]["eula"]
+        tree["autostarts"] = tree["autostarts"]["autostart"] if tree["autostarts"]
+        if tree["databases"]
+          tree["databases"]=  tree["databases"]["database"] 
+          tree["databases"].each do |d|
+            d["users"] = d["users"]["user"] if d["users"]
+          end
+        end
+        tree["lvm"]["volumes"] = tree["lvm"]["volumes"]["volume"] if tree["lvm"] && tree["lvm"]["volumes"]
+        Firewall.studio_connection = studio_connection
+        if defined? ActiveModel #we are in rails3, so set model persistent
+          Configuration.new tree,true
+        else
+          Configuration.new tree
+        end
+      end
+
     end
 
     # Represents repository assigned to appliance
@@ -238,11 +257,11 @@ module StudioApi
       end
     end
 
+    # Shortcut to find configuration of appliance. Always ask server for new one.
+    # @see StudioApi::Appliance::Configuration
     def configuration
-      request_str = "/appliances/#{id.to_i}/configuration"
-      response = GenericRequest.new(self.class.studio_connection).get request_str
       Configuration.studio_connection = self.class.studio_connection
-      Configuration.parse response
+      Configuration.find id
     end
 
     # clones appliance or template
@@ -254,7 +273,11 @@ module StudioApi
       request_str = "/appliances?clone_from=#{source_id.to_i}"
       request_str = Util.add_options request_str, options, false
       response = GenericRequest.new(studio_connection).post request_str, options
-      Appliance.new Hash.from_xml(response)["appliance"]
+      if defined? ActiveModel #we are in rails3, so set model persistent
+        Appliance.new Hash.from_xml(response)["appliance"],true
+      else
+        Appliance.new Hash.from_xml(response)["appliance"]
+      end
     end
 
     # Gets all GPG keys assigned to appliance

data/lib/studio_api/file.rb

@@ -57,7 +57,11 @@ module StudioApi
       end
       rq = GenericRequest.new studio_connection
       response = rq.post request_str, :file => content
-      File.new Hash.from_xml(response)["file"]
+      if defined? ActiveModel #rails 3 and ActiveResource persistency
+        File.new Hash.from_xml(response)["file"],true
+      else
+        File.new Hash.from_xml(response)["file"]
+      end
     end
 
 private 

data/lib/studio_api/rpm.rb

@@ -21,7 +21,11 @@ module StudioApi
     # @return [StudioApi::Rpm] uploaded RPM
     def self.upload content, base_system
       response = GenericRequest.new(studio_connection).post "/rpms?base_system=#{CGI.escape base_system.to_s}", :file => content
-      self.new Hash.from_xml(response)["rpm"]
+      if defined? ActiveModel #for rails3 we need persistent, otherwise delete method fail
+        self.new Hash.from_xml(response)["rpm"],true
+      else
+        self.new Hash.from_xml(response)["rpm"]
+      end
     end
 
     # Downloads file to specified path.

data/rubygem-studio_api.spec.template

@@ -27,8 +27,8 @@ License:        GPLv2 or The Ruby License
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  rubygems_with_buildroot_patch
 %rubygems_requires
-BuildRequires:  rubygem-activeresource >= 1.3.8
-Requires:       rubygem-activeresource >= 1.3.8
+BuildRequires:  rubygem-activeresource >= 2.3.8
+Requires:       rubygem-activeresource >= 2.3.8
 BuildRequires:  rubygem-xml-simple >= 1.0.0
 Requires:       rubygem-xml-simple >= 1.0.0
 #

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: studio_api
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  version: 3.1.4
 platform: ruby
 authors: 
 - Josef Reidinger
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +02:00
+date: 2011-11-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: xml-simple
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -96,6 +103,52 @@ files:
 - 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
+- test/file_test.rb
+- test/gallery_test.rb
+- 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
+- test/responses/builds.xml
+- test/responses/configuration.xml
+- test/responses/file.xml
+- test/responses/files.xml
+- test/responses/gallery.xml
+- test/responses/gallery_appliance.xml
+- test/responses/gpg_key.xml
+- test/responses/gpg_keys.xml
+- test/responses/manifest.xml
+- test/responses/repositories.xml
+- test/responses/repository.xml
+- 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
+- test/responses/status.xml
+- test/responses/template_sets.xml
+- test/responses/testdrive.xml
+- test/responses/testdrives.xml
+- test/responses/users_0.xml
+- 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: 
@@ -109,16 +162,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -127,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: studio_api
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Intuitive ruby bindings to Studio Api Interface.