ssc 0.2.0 → 0.3.0

data/lib/handlers/build.rb

@@ -0,0 +1,56 @@
+module SSC
+  module Handler
+    class Build < Base
+
+      default_task :build
+
+      desc "build", "build an appliance"
+      require_appliance_id
+      method_option :image_type, :type => :string
+      def build
+        require_appliance_dir 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.save
+            config_file= File.join(Dir.pwd, '.sscrc')
+            if File.exists?(config_file)
+              config= YAML::load(File.read(config_file))
+              config.merge!('latest_build_id' => build.id)
+              File.open(config_file, 'w') do |file|
+                file.write(config.to_yaml)
+              end
+            end
+            say "Build Started. Build id: #{build.id}"
+          end
+        end
+      end
+
+      desc "status", "find the build status of an appliance"
+      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
+      end
+
+      desc "list", "list builds (running or completed)"
+      require_appliance_id
+      method_option :running, :type => :boolean, :default => false
+      def list
+        builds= if options.running?
+          StudioApi::RunningBuild.find(:all, :params => {:appliance_id => options.appliance_id})
+        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]})
+      end
+
+
+    end
+  end
+end

data/lib/handlers/file.rb

@@ -4,39 +4,34 @@ module SSC
   module Handler
     class OverlayFile < Base
 
+      include DirectoryManager
 
       no_tasks do
         cattr_reader :local_source
         @@local_source= 'files/'
       end
 
-      # must be run in appliance directory
-      # takes the following argument:
-      # file_path => (relative positions("." and "..") allowed and ~ for home directory allowed)
-      # takes the following options:
-      # --path="/path/to/file_directory/"   => optional (by default it is the path of the file on the local system)
-      # --name="file_name"                  => optional (by default it is the name of the file on the local system)
-      # --permissions="0766"                => optional (default: 0755)
-      # --owner="user"                      => optional (default: root)
-      desc 'file create PATH', 'create a new overlay file'
+      desc 'file add PATH', 'create a new overlay file'
       require_appliance_id
       allow_remote_option
-      method_option :path, :type => :string, :default => ''
-      method_option :name, :type => :string, :default => ''
+      method_option :path,        :type => :string, :default => ''
+      method_option :name,        :type => :string, :default => ''
       method_option :permissions, :type => :string, :default => '0755'
-      method_option :owner, :type => :string, :default => 'root'
-      def create(path)
+      method_option :owner,       :type => :string, :default => 'root'
+      method_option :group,       :type => :string, :default => 'root'
+      def add(path)
         absolute_path= File.expand_path(path)
         optional_file_params= {:permissions => options.permissions, 
-                               :owner => options.owner}
+                               :group       => options.group,
+                               :owner       => options.owner}
         file_dir, file_name= File.split(absolute_path)
         file_dir = options.path == '' ? file_dir : options.path
         file_name = options.name == '' ? file_name : options.name
+        file_params= ({:path => file_dir, :filename => file_name})
+        file_params.merge!(optional_file_params)
         id= nil
         if options.remote?
           require_appliance do |appliance|
-            file_params= ({:path => file_dir, :filename => file_name})
-            file_params.merge!(optional_file_params)
             File.open(absolute_path) do |file|
               file= StudioApi::File.upload(file, appliance.id, file_params)
               id= file.id.to_i
@@ -44,8 +39,32 @@ module SSC
             say "Overlay file saved. Id: #{id}"
           end
         end
-        local_copy= initiate_file(file_dir, file_name, id)
-        say "Created #{local_copy}"
+        if ApplianceDirectory.new.valid?
+          local_copy= FileListFile.new.initiate_file(absolute_path, file_params)
+          say "Created #{local_copy}"
+        end
+      end
+
+      desc 'file remove FILE_NAME', 'removes existing overlay file'
+      require_appliance_id
+      allow_remote_option
+      def remove(file_name)
+        @file_list= FileListFile.new
+        file_id= @file_list.is_uploaded?(file_name)
+        if options.remote? && file_id
+          begin
+            StudioApi::File.find(file_id).destroy
+            say "File '#{file_name}' removed"
+          rescue
+            raise Thor::Error, "Couldn't remove file #{file_name} (id: #{file_id}"
+          end
+        elsif options.remote? && !file_id
+          raise Thor::Error, "File '#{file_name}' not found"
+        else
+          @file_list.push('remove', {file_name => nil})
+          @file_list.save
+          say "File '#{file_name}' marked for removal"
+        end
       end
 
       desc 'file show FILE_NAME', 'show the contents of the file'
@@ -89,7 +108,7 @@ module SSC
           out= if options.remote? || file_list_empty?
             response= StudioApi::File.find(:all, :params => {:appliance_id => appliance.id})
             response.collect do |file|
-              {file.filename => {"id" => id, "path" => file.path}}
+              {file.filename => {"id" => file.id, "path" => file.path}}
             end
           else
             list_local_files

data/lib/handlers/helper.rb

@@ -30,6 +30,12 @@ module SSC
             :default => config["appliance_id"]
         end
 
+        def require_build_id
+          config= get_config
+          method_option :build_id, :type => :numeric, :required => true,
+            :default => config["latest_build_id"]
+        end
+
         def allow_remote_option
           method_option :remote, :type => :boolean, :default => false
         end
@@ -45,6 +51,9 @@ module SSC
 
       module InstanceMethods
 
+        include DirectoryManager
+
+
         # Establish connection to Suse Studio with username, password
         def connect(user, pass, connection_options)
           @connection= StudioApi::Connection.new(user, pass, self.class::API_URL, connection_options)
@@ -62,7 +71,13 @@ module SSC
           # Included for those methods that still return arrays for printing
           # Can be removed eventually
           # Still seems to be a nice way to format the text output of methods
-          say array.join("\n"), color
+          if array.is_a?(Array)
+            array= array.collect {|i| yield(i)} if block_given?
+            say array.join("\n"), color
+          else
+            say "\n"
+          end
+          array
         end
 
         def require_appliance
@@ -72,6 +87,22 @@ module SSC
             raise "Unable to find the appliance"
           end
         end
+
+        class ApplianceDirectoryError < StandardError; end
+
+        def require_appliance_directory
+          if File.exist?('./.sscrc')
+            require_appliance do |appliance|
+              files= {
+                :package    => PackageFile.new,
+                :repository => RepositoryFile.new,
+                :file_list  => FileListFile.new }
+              yield(appliance, files)
+            end
+          else
+            raise ApplianceDirectoryError, 'Appliance directory not found'
+          end
+        end
       end
 
     end

data/lib/handlers/package.rb

@@ -47,7 +47,7 @@ module SSC
       require_appliance_id
       method_option :all_repos, :type => :boolean, :default => true
       def search(search_string)
-        require_appliance_id(@options) do |appliance|
+        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|
@@ -61,20 +61,20 @@ module SSC
       allow_remote_option
       method_option :build_id, :type => :numeric
       def list(type)
-        say("installed | selected package only", :red) unless ['installed', 'selected'].include?(type)
-        out= if options.remote? || no_local_list?
+        package_file= PackageFile.new
+        raise Thor::Error, "installed | selected package only"  unless ['installed', 'selected'].include?(type)
+        out= if options.remote? || package_file.empty_list?
           require_appliance do |appliance|
             params= {:build_id => options.build_id} if options.build_id
             software= appliance.send("#{type}_software")
             formatted_list= software.collect do |package|
               version= package.version ? { "version" => package.version } : nil
-              {package.name => version}
+              package_file.push('list', {package.name => version})
             end
-            save(type, formatted_list)
-            formatted_list
+            package_file.save
           end
         else
-          read(type)
+          package_file.read
         end
         say out.to_yaml
       end
@@ -99,7 +99,9 @@ module SSC
             end
           end
         else
-          save("add", [ name ])
+          package_file= PackageFile.new
+          package_file.push('add', name)
+          package_file.save
           say "#{name} marked for addition"
         end
       end
@@ -114,7 +116,9 @@ module SSC
             say "State: #{response['state']}"
           end
         else
-          save("remove", [ name ])
+          package_file= PackageFile.new
+          package_file.push('remove', name)
+          package_file.save
           say "#{name} marked for removal"
         end
       end
@@ -129,7 +133,9 @@ module SSC
             response.collect{|key, val| "#{key}: #{val}"}
           end
         else
-          save("ban", [ name ])
+          package_file= PackageFile.new
+          package_file.push('ban', name)
+          package_file.save
           say "#{name} marked to be banned"
         end
       end
@@ -144,7 +150,9 @@ module SSC
             response.collect{|key, val| "#{key}: #{val}"}
           end
         else
-          save("unban", [ name ])
+          package_file= PackageFile.new
+          package_file.push('unban', name)
+          package_file.save
           say "#{name} marked to be unbanned"
         end
       end

data/lib/handlers/repository.rb

@@ -48,18 +48,19 @@ module SSC
       require_appliance_id
       allow_remote_option
       def list
-        list= if options.remote? || no_local_list?
+        repo_file= RepositoryFile.new
+        list= if options.remote? || repo_file.empty_list?
           require_appliance do |appliance|
             appliance.repositories.collect do |repo|
-              { repo.id => { 'name'        => repo.name, 
-                             'type'        => repo.type, 
-                             'base_system' => repo.base_system}}
+              repo_file.push('list', { repo.id => { 'name' => repo.name, 
+                                     'type'    => repo.type, 
+                                     'base_system' => repo.base_system}})
             end
+            repo_file.save
           end
         else
-          read('list')
+          repo_file['list']
         end
-        save('list', list) unless options.remote?
         say list.to_yaml
       end
 
@@ -73,7 +74,9 @@ module SSC
             say "Added"+( response.collect{|repos| repos.name} ).join(", ")
           end
         else
-          save('add', repo_ids)
+          repo_file= RepositoryFile.new
+          repo_ids.each {|id| repo_file.push('add', id)}
+          repo_file.save
           say "Marked the following for addition #{repo_ids.join(", ")}"
         end
       end
@@ -88,19 +91,24 @@ module SSC
             say "Removed #{repo_ids.join(", ")}"
           end
         else
-          save('remove', repo_ids)
+          repo_file= RepositoryFile.new
+          repo_ids.each {|id| repo_file.push('remove', id)}
+          repo_file.save
           say "Marked the following for removal #{repo_ids.join(", ")}"
         end
       end
 
       desc 'repository import URL NAME', 'import a 3rd party repository into appliance'
+      require_authorization 
       allow_remote_option
       def import(url, name) 
         if options.remote?
           repository= StudioApi::Repository.import(url, name)
           say "Added #{repository.name} at #{url}"
         else
-          save("import", [{"name" => name, "url" => url}])
+          repo_file= RepositoryFile.new
+          repo_file.push('import', {"name" => name, "url" => url})
+          repo_file.save
           say "Marked #{name} for import"
         end
       end

data/lib/ssc.rb

@@ -8,11 +8,134 @@ require 'handlers/all'
 require 'yaml'
 
 module SSC
-  class Base < Thor
+  class Client < Handler::Base
+
+    include DirectoryManager
+
     register Handler::Appliance, :appliance, "appliance", "manage appliances"
     register Handler::Repository, :repository, "repository","manage repositories"
     register Handler::Package, :package, "package", "manage packages"
     register Handler::Template, :template, "template", "manage templates"
     register Handler::OverlayFile, :file, "file", "manage files"
+    register Handler::Build, :build, "build", "manage builds"
+
+    desc "status", "show status of the appliance"
+    require_appliance_id
+    def status
+      require_appliance_directory do |appliance, files|
+        # Show appliance status
+        say "Appliance: id: #{appliance.id} | name: #{appliance.name}"
+        say "Status: #{appliance.status.state}"
+        say appliance.status.issues
+
+        # Show additions
+        say "\nAdditions : \n"
+        say "\nPackages : \n"
+        say_array files[:package]["add"]
+        say "\nRepositories : \n"
+        say_array files[:repository]["add"]
+        say "\nOverlay Files : \n"
+        say_array(files[:file_list]["add"]) {|i| i.keys[0]}
+
+        # Show removals
+        say "\nRemovals : \n"
+        say "\nPackages : \n"
+        say_array files[:package]["remove"]
+        say "\nRepositories : \n"
+        say_array files[:repository]["remove"]
+        say "\nOverlay Files :\n "
+        say_array(files[:file_list]["remove"]) {|i| i.keys[0]}
+
+        # Show banned
+        say "\nBanned Packages : \n"
+        say_array files[:package]["ban"]
+      
+        # Show unbanned
+        say "\nUnBanned Packages : \n"
+        say_array files[:package]["unban"]
+      end
+    end
+
+    desc "checkout", "checkout the latest changes to an appliance"
+    require_appliance_id
+    def checkout
+      params= {:appliance_id => options.appliance_id,
+               :username     => options.username,
+               :password     => options.password}
+      require_appliance_directory do |appliance, files|
+        options= params.merge(:remote => true)
+        invoke "s_s_c:handler:package:list", ["installed"], options
+        invoke "s_s_c:handler:repository:list",  [], options
+        invoke "s_s_c:handler:overlay_file:list",  [], options
+      end
+    rescue ApplianceDirectoryError
+      require_appliance do |appliance|
+        ApplianceDirectory.new(appliance.name, params).create
+        Dir.chdir(appliance.name)
+        options= params.merge(:remote => true)
+        invoke "s_s_c:handler:package:list", ["installed"], options
+        invoke "s_s_c:handler:repository:list",  [], options
+        invoke "s_s_c:handler:overlay_file:list",  [], options
+      end
+    end
+
+    desc "commit", "commit changes to studio"
+    require_appliance_id
+    def commit
+      params= {:remote       => true,
+               :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
+      ["add", "remove"].each do |action|
+        while repository= repository_file.pop(action)
+          invoke "s_s_c:handler:repository:#{action}", [repository], params
+        end
+      end
+      repository_file.save
+
+      # Add Overlay Files
+      file_list = FileListFile.new
+      while file= file_list.pop("add")
+        params= params.merge(file[:params])
+        invoke "s_s_c:handler:overlay_file:add", [file[:full_path]], params
+      end
+      # Remove Overlay Files
+      while file= file_list.pop("remove")
+        invoke "s_s_c:handler:overlay_file:remove", [file[:name]], params
+      end
+      file_list.save
+    end
+
+    class << self
+      def help(*args)
+        message= <<HELP_MESSAGE 
+Tasks:
+  ssc checkout          # checkout the latest changes to an appliance
+  ssc commit            # commit changes to studio
+  ssc status            # show status of the appliance
+
+  ssc appliance         # manage appliances
+  ssc build             # manage builds
+  ssc file              # manage files
+  ssc package           # manage packages
+  ssc repository        # manage repositories
+  ssc template          # manage templates
+
+  ssc help [TASK]       # Describe available tasks or one specific task
+HELP_MESSAGE
+       puts message
+      end
+    end
   end
 end