ssc 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/handlers/appliance.rb

@@ -18,6 +18,7 @@ module SSC
         appliance_dir= ApplianceDirectory.new(appliance_name, appliance_params)
         appliance_dir.create
         say_array(["Created: ", appliance_dir.path] + appliance_dir.files.values)
+        say "" # make sure terminal output starts on a new line
       end
       
       desc "appliance list", "list all appliances"

data/lib/handlers/build.rb

@@ -4,15 +4,15 @@ module SSC
 
       default_task :build
 
-      desc "build", "build an appliance"
+      desc "build", "Builds an appliance.\n\nAccepted image types: oem, iso, xen, vmx"
       require_appliance_id
-      method_option :image_type, :type => :string
+      method_option :image_type, :type => :string, :default => "iso"
       def build
         require_appliance_directory do |appliance, files|
           if appliance.status.state != "ok"
             raise Thor::Error, "Appliance is not OK. Please fix before building.\n#{appliance.status.issues.join("\n")}\n"
           else
-            build = StudioApi::RunningBuild.new(:appliance_id => appliance.id, :image_type => options.image_type)
+            build = StudioApi::RunningBuild.new(:appliance_id => appliance.id, :image_type => options.image_type, :force => true)
             build.save
             config_file= File.join(Dir.pwd, '.sscrc')
             if File.exists?(config_file)
@@ -31,9 +31,9 @@ module SSC
       require_authorization
       require_build_id
       def status
-        build = StudioApi::Build.find options.build_id
-        additional_info=(build.state == 'finished' ? "" : " - #{build.percent}")
-        say "Build Status: #{build.state}" + additional_info
+        build = StudioApi::RunningBuild.find options.build_id
+        say "Build Status: #{build.state}"
+        say "#{build.percent}% completed" if build.state == "running"
       end
 
       desc "list", "list builds (running or completed)"
@@ -45,12 +45,24 @@ module SSC
         else
           StudioApi::Build.find(:all, :params => {:appliance_id => options.appliance_id})
         end
+        
         say "Build List:\n"
-        print_table([["id", "version", "state"]]+
-                    builds.collect{|i| [i.id, "v#{i.version}", i.state]})
+        builds_info = builds.collect{ |i|
+          [i.id, "v#{i.version}", i.state, format_download_url(i)]
+        }
+                    
+        print_table([["id", "version", "state", "download link"]]+ builds_info)
       end
 
+      private
 
+      def format_download_url build
+        if build.respond_to?(:download_url)
+          build.download_url
+        else
+          "n\\a"
+        end
+      end
     end
   end
 end

data/lib/handlers/helper.rb

@@ -16,9 +16,9 @@ module SSC
         def require_authorization
           config= get_config
           method_option :username, :type => :string, :required => true, 
-            :default => config["username"]
+            :default => config["username"], :aliases => "-u"
           method_option :password, :type => :string, :required => true, 
-            :default => config["password"]
+            :default => config["password"], :aliases => "-p"
           method_option :proxy, :type => :string
           method_option :timeout, :type => :string
         end

data/lib/ssc.rb

@@ -86,14 +86,6 @@ module SSC
                :appliance_id => options.appliance_id,
                :username     => options.username,
                :password     => options.password}
-      # Add, Remove, Ban and Unban  Packages
-      package_file= PackageFile.new
-      ["add", "remove", "ban", "unban"].each do |action|
-        while package= package_file.pop(action)
-          invoke "s_s_c:handler:package:#{action}", [package], params
-        end
-      end
-      package_file.save
 
       # Add or Remove Repositories
       repository_file= RepositoryFile.new
@@ -104,6 +96,15 @@ module SSC
       end
       repository_file.save
 
+      # Add, Remove, Ban and Unban  Packages
+      package_file= PackageFile.new
+      ["add", "remove", "ban", "unban"].each do |action|
+        while package= package_file.pop(action)
+          invoke "s_s_c:handler:package:#{action}", [package], params
+        end
+      end
+      package_file.save
+
       # Add Overlay Files
       file_list = FileListFile.new
       while file= file_list.pop("add")

data/ssc.gemspec

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

metadata

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