ssc 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/handlers/package.rb

@@ -50,8 +50,8 @@ module SSC
         require_appliance do |appliance|
           params= {:all_repos => options.all_repos} if options.all_repos
           software= appliance.search_software(search_string, params)
-          say_array software.collect do |software|
-            "#{software.name} v#{software.version}. Repo Id: #{software.repository_id}"
+          software.collect do |software|
+            say "#{software.name} v#{software.version}. Repo Id: #{software.repository_id}"
           end
         end
       end
@@ -88,7 +88,7 @@ module SSC
           require_appliance do |appliance|
             response= appliance.add_package(name)
             say case response['state']
-            when "fixed"
+            when "changed"
               "Package Added. State: #{response['state']}"
             when "equal"
               "Package Not Added."

data/lib/handlers/repository.rb

@@ -38,10 +38,13 @@ module SSC
         params= {:filter => search_string}
         params= params.merge({:base_system => options.base_system}) if options.base_system
         repos= StudioApi::Repository.find(:all, :params => params)
-        say_array(repos.collect do |repo|
-          "#{repo.id}.) #{repo.name}: #{repo.base_url}
-          #{[repo.matches.software_name].flatten.join(', ')}\n"
-        end)
+        repos.collect do |repo|
+          # for some reason some repos don't have a base_url
+          if repo.respond_to?('base_url')
+            say "#{repo.id}.) #{repo.name}: #{repo.base_url}
+            #{[repo.matches.attributes["software_name"]].flatten.join(', ')}\n"
+          end
+        end
       end
 
       desc "repository list", "list all repositories in a given appliance"
@@ -71,7 +74,7 @@ module SSC
         if options.remote?
           require_appliance do |appliance|
             response= appliance.add_repository(repo_ids)
-            say "Added"+( response.collect{|repos| repos.name} ).join(", ")
+            say "Added "+( response.collect{|repos| repos.name} ).join(", ")
           end
         else
           repo_file= RepositoryFile.new

data/lib/handlers/template.rb

@@ -5,19 +5,30 @@ module SSC
       desc 'template list_sets', 'list all available template sets'
       require_authorization
       def list_sets
-        templates= StudioApi::TemplateSet.find(:all)
+        templates= get_templates
         say_array templates.collect {|template| template.name}
       end
 
       desc 'template list SET_NAME', 'show details of a particular template set'
       require_authorization
       def list(name)
-        template_set= StudioApi::TemplateSet.find(name)
-        out = [template_set.name+' : '+template_set.description]
-        out += template_set.template.collect do |appliance| 
-          "#{appliance.appliance_id}: #{appliance.name}"
+        template_set= get_templates.select{|t| t.name == name}[0]
+
+        if template_set.nil?
+          say "Template set called '#{name}' was not found."
+        else
+          out = [template_set.name+' : '+template_set.description]
+          out += template_set.template.collect do |appliance| 
+            "#{appliance.appliance_id}: #{appliance.name}"
+          end
+          say_array out
         end
-        say_array out
+      end
+      
+    private
+
+      def get_templates
+        StudioApi::TemplateSet.find(:all)
       end
     end
   end

data/ssc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ssc}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ratan Sebastian"]
-  s.date = %q{2011-09-06}
+  s.date = %q{2011-09-07}
   s.default_executable = %q{ssc}
   s.description = %q{Command-line client for Suse Studio}
   s.email = %q{rjsvaljean@gmail.com}

data/test/integration/test_repository.rb

@@ -21,7 +21,7 @@ class TestRepository < Test::Unit::TestCase
 
     context "search" do
       setup do
-        @default_mock_repo.stubs(:matches).returns(stub(:software_name => ''))
+        @default_mock_repo.stubs(:matches).returns(stub(:attributes => ''))
         StudioApi::Repository.expects(:find).with(:all, has_entry(:params, {:filter => 'search_string'})).returns([@default_mock_repo])
       end
       should "search all repos" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Ratan Sebastian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +02:00
+date: 2011-09-07 00:00:00 +02:00
 default_executable: ssc
 dependencies: 
 - !ruby/object:Gem::Dependency