ssc 0.3.0 → 0.4.0

data/README.rdoc

@@ -15,9 +15,9 @@ This is the new version of the the Suse Studio command line client. Built as a p
 
 === Command Listing
 
-ssc checkout --appliance-id=N --password=PASSWORD --username=USERNAME  # checkout the latest changes to an appliance
-ssc commit --appliance-id=N --password=PASSWORD --username=USERNAME    # commit changes to studio
-ssc status --appliance-id=N --password=PASSWORD --username=USERNAME    # show status of the appliance
+    ssc checkout --appliance-id=N --password=PASSWORD --username=USERNAME  # checkout the latest changes to an appliance
+    ssc commit --appliance-id=N --password=PASSWORD --username=USERNAME    # commit changes to studio
+    ssc status --appliance-id=N --password=PASSWORD --username=USERNAME    # show status of the appliance
 
 ssc appliance   # manage appliances
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/directory_manager.rb

@@ -98,13 +98,13 @@ module SSC
           file_params= options.slice(:permissions, :group, :owner).merge(:path => file_path)
           push("add", {file_name => file_params})
         end
-        destination_file
+        destination_path
       end
 
       def is_uploaded?(file_name)
         read
         list= @parsed_file["list"].select{|i| i.keys[0] == file_name}
-        list.length > 0 ? list[0]["id"].to_i : nil
+        list[0][file_name]["id"] if list.length > 0 
       end
 
     end
@@ -141,6 +141,13 @@ module SSC
       def valid?
 	Dir.exists?(@path) && File.exists?(File.join(@path, '.sscrc'))
       end
+
+      class << self
+        def show_file(relative_path)
+          path= File.join(@path, relative_path)
+          File.read(path)
+        end
+      end
     end
   end
 end

data/lib/handlers/all.rb

@@ -12,7 +12,7 @@ module SSC
 
       include Helper
 
-      API_URL= 'https://susestudio.com/api/v1/user'
+      API_URL= 'https://susestudio.com/api/v2/user'
 
       def initialize(*args)
         super

data/lib/handlers/build.rb

@@ -8,7 +8,7 @@ module SSC
       require_appliance_id
       method_option :image_type, :type => :string
       def build
-        require_appliance_dir do |appliance, files|
+        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

data/lib/handlers/file.rb

@@ -49,8 +49,8 @@ module SSC
       require_appliance_id
       allow_remote_option
       def remove(file_name)
-        @file_list= FileListFile.new
-        file_id= @file_list.is_uploaded?(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
@@ -61,8 +61,8 @@ module SSC
         elsif options.remote? && !file_id
           raise Thor::Error, "File '#{file_name}' not found"
         else
-          @file_list.push('remove', {file_name => nil})
-          @file_list.save
+          file_list.push('remove', {file_name => nil})
+          file_list.save
           say "File '#{file_name}' marked for removal"
         end
       end
@@ -70,51 +70,89 @@ module SSC
       desc 'file show FILE_NAME', 'show the contents of the file'
       require_appliance_id
       allow_remote_option
+      method_option :file_id, :type => :string
       def show(file_name)
         if options.remote?
-          id= find_file_id(file_name)
-          response= StudioApi::File.find(id)
-          say response.content
+          begin
+            require_appliance_directory do |appliance, files|
+              id= files[:file_list].is_uploaded?(file_name)
+              if id
+                response= StudioApi::File.find(id)
+                say response.content
+              else
+                say "File hasn't been uploaded.\nLocal Copy:", :red
+                say ApplianceDirectory.show_file(File.join('files',file_name))
+              end
+            end
+          rescue ApplianceDirectoryError
+            if options.file_id
+              say StudioApi::File.find(options.file_id).content
+            else
+              files= StudioApi::File.find(:all)
+              files= files.select {|f| f.filename == file_name}
+              raise Thor::Error, "File not found or ambiguous file name " unless files.length == 1
+              say files[0].content
+            end
+          end
         else
-          say show_file(file_name)
+          say ApplianceDirectory.show_file(File.join('files', file_name))
         end
       end
 
       desc 'file diff FILE_NAME', 'show the diff of the remote file and the local one'
       require_appliance_id
       def diff(file_name)
-        begin
-          id= find_file_id(file_name)
-          file_content= StudioApi::File.find(id).content
-        rescue
-          say "unable to connect or not in appliance directory", :red
-        end
-
-        begin
+        require_appliance_directory do |appliance, files|
+          id= files[:file_list].is_uploaded?(file_name)
+          raise Thor::Error, "File hasn't been uploaded" unless id
+          response= StudioApi::File.find(id)
+          remote_content= response.content
+          local_file= File.join(Dir.pwd, 'files', file_name)
           tempfile=Tempfile.new('ssc_file') 
-          tempfile.write(file_content)
-          say find_diff(tempfile.path, full_local_file_path(file_name))
+          tempfile.write(remote_content)
+          say find_diff(tempfile.path, local_file)
           tempfile.close; tempfile.unlink
-        rescue Errno::ENOENT
-          say "diff not installed", :red
         end
+      rescue ApplianceDirectoryError
+        raise Thor::Error, "diff can only be performed in the appliance directory"
       end
 
       desc 'file list', 'show all overlay files'
       require_appliance_id
       allow_remote_option
       def list
-        require_appliance do |appliance|
-          out= if options.remote? || file_list_empty?
+        require_appliance_directory do |appliance, files|
+          file_list= files[:file_list]
+          out= if options.remote? || file_list.empty_list?
             response= StudioApi::File.find(:all, :params => {:appliance_id => appliance.id})
-            response.collect do |file|
-              {file.filename => {"id" => file.id, "path" => file.path}}
+            response= response.collect do |file|
+              item= {file.filename => {"id" => file.id, "path" => file.path}}
+              file_list.push('list', item)
             end
+            file_list.save
+            response
           else
-            list_local_files
+            file_list["list"]
           end
           say out.to_yaml
         end
+      rescue ApplianceDirectoryError
+        require_appliance do |appliance|
+          print_table StudioApi::File.find(:all, :params => {:appliance_id => appliance.id}).collect do |file|
+            [file.id, File.join(file.path, file.filename)]
+          end
+        end
+      end
+
+      private
+
+      def get_file_list(appliance_id)
+      end
+
+      def find_diff(file1, file2)
+        `diff #{file1} #{file2}`
+      rescue Errno::ENOENT
+        raise Thor::Error, "'diff' not installed"
       end
     end
   end

data/ssc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ssc}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ratan Sebastian"]
-  s.date = %q{2011-08-15}
+  s.date = %q{2011-08-31}
   s.default_executable = %q{ssc}
   s.description = %q{Command-line client for Suse Studio}
   s.email = %q{rjsvaljean@gmail.com}
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Command-line client for Suse Studio}
+  s.summary = %q{Command-line client for Suse Studio.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/integration/test_file.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 class TestOverlayFile < Test::Unit::TestCase
+
+  include SSC::DirectoryManager
+
   context "file" do
     setup do
       @client= SSC::Client.new
@@ -10,7 +13,7 @@ class TestOverlayFile < Test::Unit::TestCase
       StudioApi::Appliance.stubs(:clone).returns(@default_mock_appliance)
       @client.invoke('s_s_c:handler:appliance:create', ['test_appliance'], {:source_id => 1234}.merge(@auth_params))
       @default_mock_package= StudioApi::Package.new('test_package', :version => '1', :repository_id => 9876)
-      StudioApi::Appliance.stubs(:find).with(5678).returns(@default_mock_appliance)
+      StudioApi::Appliance.stubs(:find).returns(@default_mock_appliance)
     end
     context "add" do
       setup do
@@ -25,7 +28,7 @@ class TestOverlayFile < Test::Unit::TestCase
           should "upload file and create a new file locally" do
             StudioApi::File.expects(:upload).returns(stub(:id => 1))
             mock_file_list= mock()
-            SSC::DirectoryManager::FileListFile.stubs(:new).returns(mock_file_list)
+            FileListFile.stubs(:new).returns(mock_file_list)
             mock_file_list.expects(:initiate_file).with(@test_file_path, anything)
             @client.invoke('s_s_c:handler:overlay_file:add', [@test_file_path], {:remote => true, :appliance_id => 5678})
           end
@@ -33,7 +36,7 @@ class TestOverlayFile < Test::Unit::TestCase
         context "when the remote flag is not set" do
           should "just add the file to the file_list in the add section" do
             mock_file_list= mock()
-            SSC::DirectoryManager::FileListFile.stubs(:new).returns(mock_file_list)
+            FileListFile.stubs(:new).returns(mock_file_list)
             mock_file_list.expects(:initiate_file).with(@test_file_path, anything)
             @client.invoke('s_s_c:handler:overlay_file:add', [@test_file_path], {:appliance_id => 5678})
           end
@@ -42,7 +45,7 @@ class TestOverlayFile < Test::Unit::TestCase
       context "when not in the appliance directory" do
         setup do
           Dir.chdir('..') if File.exist?('./.sscrc')
-          SSC::DirectoryManager::ApplianceDirectory.any_instance.stubs(:valid).returns(false)
+          ApplianceDirectory.any_instance.stubs(:valid).returns(false)
         end
         context "when the remote flag is set" do
           should "just upload the file" do
@@ -56,7 +59,7 @@ class TestOverlayFile < Test::Unit::TestCase
     context "remove" do
       context "when the remote flag is set" do
         should "destroy the file remotely" do
-          SSC::DirectoryManager::FileListFile.any_instance.stubs(:is_uploaded?).returns(:id)
+          FileListFile.any_instance.stubs(:is_uploaded?).returns(:id)
           mock_file_object= mock()
           mock_file_object.expects(:destroy)
           StudioApi::File.expects(:find).with(:id).returns(mock_file_object)
@@ -70,11 +73,79 @@ class TestOverlayFile < Test::Unit::TestCase
           mock_file_list.stubs(:is_uploaded?).returns(:id)
           mock_file_list.expects(:push).with('remove', has_key('test_file'))
           mock_file_list.expects(:save)
-          SSC::DirectoryManager::FileListFile.stubs(:new).returns(mock_file_list)
+          FileListFile.stubs(:new).returns(mock_file_list)
           @client.invoke('s_s_c:handler:overlay_file:remove', ["test_file"], {})
         end
       end
     end
+    context "show" do
+      context "when not in the appliance directory" do
+        setup do
+          Dir.chdir('..') if File.exists?('.sscrc')
+        end
+        context "and when the remote flag is set with the file_id option" do
+          should "show the file using the file_id" do
+            StudioApi::File.expects(:find).with(1).returns(stub(:content => ''))
+            @client.invoke('s_s_c:handler:overlay_file:show', ['test_file'], @appliance_params.merge({:remote => true, :file_id => 1}))
+          end
+        end
+        context "and when the remote flag is set without the file_id option" do
+          should "show the file using the file_name" do
+            StudioApi::File.expects(:find).with(:all).returns([stub(:content => '', :filename => 'test_file')])
+            @client.invoke('s_s_c:handler:overlay_file:show', ['test_file'], @appliance_params.merge({:remote => true}))
+          end
+        end
+      end
+      context "when in the appliance directory" do
+        setup do
+          Dir.chdir('test_appliance') if Dir.exists?('test_appliance')
+        end
+        context "and when the remote flag is set" do
+          should "show the file if file has been uploaded" do
+            FileListFile.any_instance.stubs(:is_uploaded?).returns(:id)
+            StudioApi::File.expects(:find).with(:id).returns(stub(:content => ''))
+            @client.invoke('s_s_c:handler:overlay_file:show', ['test_file'], @appliance_params.merge({:remote => true}))
+          end
+
+          should "show the local file if the file hasn't been uploaded" do
+            FileListFile.any_instance.stubs(:is_uploaded?).returns(nil)
+            ApplianceDirectory.expects(:show_file).with('files/test_file')
+            @client.invoke('s_s_c:handler:overlay_file:show', ['test_file'], @appliance_params.merge({:remote => true}))
+          end
+        end
+      end
+    end
+
+    context "diff" do
+      context "when in the appliance directory" do
+        setup do
+          Dir.chdir('test_appliance') if Dir.exists?('test_appliance')
+          File.open('files/test_file', 'w') {|f| f.write('test')}
+        end
+        should "show the diff of the two files" do
+          FileListFile.any_instance.expects(:is_uploaded?).returns(:id)
+          StudioApi::File.expects(:find).with(:id).returns(stub(:content => ''))
+          @client.invoke('s_s_c:handler:overlay_file:diff', ['test_file'], @appliance_params)
+        end
+      end
+    end
+
+    context "list" do
+      context "when in an appliance directory" do
+        setup do
+          Dir.chdir('test_appliance') if Dir.exists?('test_appliance')
+        end
+        should "list the files and save to the file list file" do
+          FileListFile.any_instance.stubs(:empty_list? => true, :push => {}, :[] => {})
+          mock_file= StudioApi::File.new(:path => 'path', :id => 1, 
+                                         :filename => 'filename')
+          StudioApi::File.expects(:find).with(:all, anything).returns([mock_file])
+          @client.invoke('s_s_c:handler:overlay_file:list', [], @appliance_params)
+        end
+      end
+      context "when not in an appliance directory" do
+      end
+    end
   end
 
 

data/test/unit/test_directory_manager.rb

@@ -1,5 +1,49 @@
 require 'helper'
 
+class TestFileListFile < Test::Unit::TestCase
+  include SSC::DirectoryManager
+  
+  def setup
+    @file_list_file= FileListFile.new
+    @data = {"list"   => [{'file2' => {'path' => '/file/path'}},
+                          {'file1' => {'id'    => 1, 
+                                       'path'  => '/file/path',
+                                       'owner' => 'root',
+                                       'group' => 'root' }}],
+             "add"    => [],
+             "remove" => []}
+    @file_list_file.instance_variable_set('@parsed_file', @data)
+  end
+
+  context "#pop" do
+    should "reformat the file list hash" do
+      assert_equal({:name=>"file1", :full_path=>"/file/path", 
+                    :params=>{"owner"=>"root", "group"=>"root"}}, 
+                   @file_list_file.pop('list'))
+    end
+  end
+
+  context "#initiate_file" do
+    should "create a file and make an entry in the file_list file" do
+      FileUtils.mkdir_p('files')
+      File.open('test_file', 'w') {|f| f.write('test')}
+      @file_list_file.initiate_file('test_file', {'key' => 'value'})
+      assert File.exists? 'files/test_file'
+      FileUtils.rm_rf('files')
+      FileUtils.rm('test_file')
+    end
+  end
+
+  context "#is_uploaded?" do
+    should "return the id if the file is uploaded" do
+      assert_equal 1, @file_list_file.is_uploaded?('file1')
+    end
+    should "return false if file is not uploaded" do
+      assert_equal nil, @file_list_file.is_uploaded?('file2')
+    end
+  end
+end
+
 class TestDirectoryManager < Test::Unit::TestCase
   include SSC::DirectoryManager
 
@@ -40,6 +84,9 @@ class TestDirectoryManager < Test::Unit::TestCase
         assert_equal 4, @file.pop('add')
         assert !@file.instance_variable_get('@parsed_file')["add"].include?(4)
       end
+      should "return nil if the section is empty" do
+        assert_equal nil, @file.pop("empty_section")
+      end
     end
 
     context "#push" do
@@ -58,6 +105,19 @@ class TestDirectoryManager < Test::Unit::TestCase
       end
     end
 
+    context "#[]" do
+      context "when the section exists" do
+        should "return the list from the section" do
+          assert @file["add"] == [{"sub" => {1 => "one", 2 => "two"}}, 2, 3, 4]
+        end
+      end
+      context "when the section does not exist" do
+        should "return a empty list" do
+          assert @file["empty_section"] == []
+        end
+      end
+    end
+
     context "#read" do
       should "return the parsed contents of the file if the file is available" do
         assert @file.read.is_a?(Hash)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ratan Sebastian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +02:00
+date: 2011-08-31 00:00:00 +02:00
 default_executable: ssc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Command-line client for Suse Studio
+summary: Command-line client for Suse Studio.
 test_files: []