dister 0.1.0 → 0.1.1

data/Changelog

@@ -0,0 +1,9 @@
+Fri May 06 16:46:10 CEST 2011  Flavio Castelli <flavio@castelli.name>
+
+	* appliance building: ask the user what to do when there's already an
+	image with the same version.
+	* release version 1.0.1 
+
+Wed May 04 16:00:00 CEST 2011  Flavio Castelli <flavio@castelli.name>
+
+	* released first version 1.0.0

data/dister.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Flavio Castelli', 'Dominik Mayer']
   s.email       = ['flavio@castelli.name','dmayer@novell.com']
-  s.homepage    = "https://features.opensuse.org/311133"
+  s.homepage    = "https://github.com/flavio/dister"
   s.summary     = "Heroku like solution for SUSE Studio"
   s.description = "Turn your rails app into a SUSE Studio appliance in a few steps."
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "curb"
   s.add_dependency "progressbar"
-  s.add_dependency "studio_api", "~>3.1.0"
+  s.add_dependency "studio_api", "~>3.1.1"
   s.add_dependency "thor", "~>0.14.0"
 
   s.add_development_dependency "bundler", "~>1.0.0"

data/lib/dister.rb

@@ -7,6 +7,7 @@ require 'bundler'
 require 'curb'
 
 require File.expand_path('../dister/cli', __FILE__)
+require File.expand_path('../dister/constants', __FILE__)
 require File.expand_path('../dister/core', __FILE__)
 require File.expand_path('../dister/options', __FILE__)
 require File.expand_path('../dister/utils', __FILE__)

data/lib/dister/cli.rb

@@ -1,11 +1,6 @@
 module Dister
 
   class Cli < Thor
-
-    VALID_TEMPLATES = %w(JeOS Server X Gnome KDE)
-    VALID_FOMATS = %w(oem vmx iso xen) #TODO: add other formats
-    VALID_ARCHS = %w(i686 x86_64)
-
     include Thor::Actions
 
     # Returns Dister's root directory.
@@ -32,17 +27,38 @@ module Dister
       ensure_valid_option options[:arch], VALID_ARCHS, "arch"
       ensure_valid_option options[:template], VALID_TEMPLATES, "template"
       basesystems = @core.basesystems
-      basesystem = options[:basesystem] || basesystems.find_all{|a| a =~ /\d+\.\d+/}.sort.last
+      if basesystems.empty?
+        STDERR.puts "No basesystem found, contact server administrator"
+        exit 1
+      end
+
+      if options[:basesystem].nil?
+        # attempt to find latest version of openSUSE
+        basesystem = basesystems.find_all{|a| a =~ /\d+\.\d+/}.sort.last
+        if basesystem.nil?
+          # apparently this server doesn't offer openSUSE basesystem
+          @shell.say "Available base systems:"
+          basesystems.each_with_index { |b,i| @shell.say "#{i+1} - #{b}" }
+          begin
+            choice = @shell.ask("Which base system do you want to use?"\
+                                "[1-#{basesystems.size}]")
+          end while (choice.to_i > basesystems.size || choice.to_i < 1)
+          basesystem = basesystems[choice.to_i - 1]
+        end
+      else
+        basesystem = options[:basesystem]
+      end
       ensure_valid_option basesystem, basesystems, "base system"
       # Create appliance and add patterns required to build native gems.
       @core.create_appliance(appliance_name, options[:template], basesystem, options[:arch])
     end
 
     desc "build", "Build the appliance."
+    method_option :force, :type => :boolean, :default => false, :required => false
     def build
       access_core
       ensure_appliance_exists
-      if @core.build
+      if @core.build options
         puts "Appliance successfully built."
       else
         puts "Build failed."
@@ -70,14 +86,14 @@ module Dister
     def format(operation,format = nil)
       access_core
       ensure_valid_option operation, %w(add rm list), "operation"
-      if operation == 'list' and options[:all]
+      if operation == 'list'
         puts "Available formats:"
-        puts VALID_FOMATS
+        puts VALID_FORMATS
       else
         existing_types = @core.options.build_types || []
         chosen_types = case operation
           when "add"
-            ensure_valid_option format, VALID_FOMATS, "format"
+            ensure_valid_option format, VALID_FORMATS, "format"
             @core.options.build_types = (existing_types + [format]).uniq
           when "rm"
             @core.options.build_types = (existing_types - [format])

data/lib/dister/constants.rb

@@ -0,0 +1,5 @@
+module Dister
+  VALID_TEMPLATES = %w(JeOS Server X Gnome KDE)
+  VALID_FORMATS = [ 'xen', 'oem', 'vmx', 'iso', 'ec2', 'net', 'oemiso' ]
+  VALID_ARCHS = %w(i686 x86_64)
+end

data/lib/dister/core.rb

@@ -75,13 +75,31 @@ module Dister
       app
     end
 
-    def build
+    def build build_options = {}
       verify_status
-      #TODO: build using another format
-      build = StudioApi::RunningBuild.create(
-        :appliance_id => @options.appliance_id,
-        :image_type => "oem"
-      )
+      #TODO:
+      # * build using another format
+      force   = build_options[:force]
+      version = nil
+      begin
+        params = {
+                   :appliance_id => @options.appliance_id,
+                   :image_type   => "oem"
+                 }
+        params[:force]   = force if force
+        params[:version] = version if version
+        build = StudioApi::RunningBuild.create(params)
+      rescue StudioApi::ImageAlreadyExists
+        @shell.say 'An image with the same version already exists'
+        overwrite = @shell.ask? 'Do you want to overwrite it? (y/n)'
+        if overwrite == 'y'
+          force = true
+          retry
+        else
+          version = @shell.ask? 'Enter new version number:'
+          retry
+        end
+      end
 
       build.reload
       if build.state == "queued"
@@ -291,7 +309,7 @@ module Dister
             begin
               choice = @shell.ask("Which repo do you want to use? "\
                                   "[1-#{repositories.size+1}]")
-            end while (choice.to_i > (repositories.size+1))
+            end while (choice.to_i > (repositories.size+1) || choice.to_i < 1)
             if (choice.to_i == (repositories.size+1))
               abort("Package not added.")
             else

data/lib/dister/downloader.rb

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 module Dister
   class Downloader
     attr_reader :filename

data/lib/dister/version.rb

@@ -1,5 +1,5 @@
 module Dister
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
 end

data/test/cli_test.rb

@@ -114,6 +114,49 @@ class CliTest < Test::Unit::TestCase
         end
       end
 
+      should "exit if no base system is available" do
+        STDERR.stubs(:puts)
+        Dister::Core.any_instance.stubs(:basesystems).returns([])
+        assert_raise SystemExit do
+          Dister::Cli.start(['create', 'foo'])
+        end
+      end
+
+      context "openSUSE base system is not available" do
+        setup do
+          @basesystems = ["SLED10_SP2", "SLES10_SP2", "SLED11", "SLES11",
+                          "SLES11_SP1", "SLED11_SP1", "SLED10_SP3",
+                          "SLES10_SP3", "SLES11_SP1_VMware"]
+          Dister::Core.any_instance.stubs(:basesystems).returns(@basesystems)
+        end
+
+        should "ask the user which base system to use" do
+          Thor::Shell::Color.any_instance.stubs(:say)
+          Thor::Shell::Color.any_instance.expects(:ask).returns(1)
+          fake_app = mock()
+          fake_app.stubs(:edit_url).returns("http://susestudio.com")
+          Dister::Core.any_instance.expects(:create_appliance).\
+                                    with("foo", "JeOS", @basesystems[0], "i686").\
+                                    returns(fake_app)
+
+          assert_nothing_raised do
+            Dister::Cli.start(['create', 'foo'])
+          end
+        end
+        
+        should "not ask the user which base system to use if there's a preference" do
+          Thor::Shell::Color.any_instance.expects(:ask).never
+          fake_app = mock()
+          fake_app.stubs(:edit_url).returns("http://susestudio.com")
+          Dister::Core.any_instance.expects(:create_appliance).\
+                                    with("foo", "JeOS", @basesystems[0], "i686").\
+                                    returns(fake_app)
+          assert_nothing_raised do
+            Dister::Cli.start(['create', 'foo', "--basesystem", @basesystems[0]])
+          end
+        end
+      end
+
       should "detect bad combination of template and basesystem" do
         STDERR.stubs(:puts)
         assert_raise(SystemExit) do

data/test/core_test.rb

@@ -3,6 +3,11 @@ require File.expand_path('../test_helper', __FILE__)
 class CoreTest < Test::Unit::TestCase
   context "Using FakeFS -" do
     setup do
+      @core = Dister::Core.new
+      @core.stubs(:puts)
+      @core.options.appliance_id = 1
+      STDERR.stubs(:puts)
+
       FakeFS.activate!
     end
 
@@ -12,22 +17,19 @@ class CoreTest < Test::Unit::TestCase
 
     context "file uploading" do
       should "not upload non-existing files" do
-        STDERR.stubs(:puts)
-        core = Dister::Core.new
-        assert !core.file_upload("foo")
+        assert !@core.file_upload("foo")
       end
 
       should "upload an existing files" do
+        Dister::Utils.stubs(:print)
         STDOUT.stubs(:puts)
         FileUtils.touch "foo"
-        core = Dister::Core.new
-        core.stubs(:puts)
         StudioApi::File.expects(:find).once.returns([])
         StudioApi::File.expects(:upload).\
-                        with(is_a(File), nil, {}).\
+                        with(is_a(File), @core.options.appliance_id, {}).\
                         once.\
                         returns(true)
-        assert core.file_upload("foo", {})
+        assert @core.file_upload("foo", {})
       end
     end
 
@@ -54,6 +56,79 @@ class CoreTest < Test::Unit::TestCase
       end
     end
 
+    context "Build an appliance" do
+      setup do
+        @core = Dister::Core.new
+        @core.options.appliance_id = 1
+        @core.stubs(:puts)
+        Dister::Utils.stubs(:print)
+
+        # do not clutter unit test results with a progress bar
+        silent_pbar = mock()
+        silent_pbar.stubs(:set)
+        silent_pbar.stubs(:finish)
+        ProgressBar.stubs(:new).returns(silent_pbar)
+
+        @core.expects(:verify_status).returns(true)
+      end
+
+      context 'an image with the same version already exists' do
+        should 'overwrite it if the user wants' do
+          build_sequence = sequence('build_sequence')
+          StudioApi::RunningBuild.expects(:create).\
+            with( { :appliance_id => @core.options.appliance_id,
+                    :image_type   => 'oem' } ).\
+            once.\
+            raises(StudioApi::ImageAlreadyExists).\
+            in_sequence(build_sequence)
+          @core.shell.expects(:say).in_sequence(build_sequence)
+          @core.shell.expects(:ask?).in_sequence(build_sequence).\
+                      returns('y')
+          fake_build = mock()
+          StudioApi::RunningBuild.expects(:create).\
+            with( { :appliance_id => @core.options.appliance_id,
+                    :image_type   => 'oem',
+                    :force        => true } ).\
+            once.\
+            returns(fake_build).\
+            in_sequence(build_sequence)
+
+          fake_build.stubs(:reload)
+          fake_build.stubs(:state).returns('finished')
+          @core.build
+        end
+
+        should 'use the new version specified by the user' do
+          new_version = '1.0.1'
+          build_sequence = sequence('build_sequence')
+          StudioApi::RunningBuild.expects(:create).\
+            with( { :appliance_id => @core.options.appliance_id,
+                    :image_type   => 'oem' } ).\
+            once.\
+            raises(StudioApi::ImageAlreadyExists).\
+            in_sequence(build_sequence)
+          @core.shell.expects(:say).in_sequence(build_sequence)
+          @core.shell.expects(:ask?).in_sequence(build_sequence).\
+                      returns('n')
+          @core.shell.expects(:ask?).in_sequence(build_sequence).\
+                      returns(new_version)
+          fake_build = mock()
+          StudioApi::RunningBuild.expects(:create).\
+            with( { :appliance_id => @core.options.appliance_id,
+                    :image_type   => 'oem',
+                    :version      => new_version } ).\
+            once.\
+            returns(fake_build).\
+            in_sequence(build_sequence)
+
+          fake_build.stubs(:reload)
+          fake_build.stubs(:state).returns('finished')
+          @core.build
+        end
+
+      end
+    end
+
     context "verify status" do
       setup do
         @core = Dister::Core.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dister
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Flavio Castelli
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 +02:00
+date: 2011-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 3
         - 1
-        - 0
-        version: 3.1.0
+        - 1
+        version: 3.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -165,6 +165,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Changelog
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -177,6 +178,7 @@ files:
 - lib/adapters/sqlite3.yml
 - lib/dister.rb
 - lib/dister/cli.rb
+- lib/dister/constants.rb
 - lib/dister/core.rb
 - lib/dister/db_adapter.rb
 - lib/dister/downloader.rb
@@ -196,7 +198,7 @@ files:
 - test/options_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: https://features.opensuse.org/311133
+homepage: https://github.com/flavio/dister
 licenses: []
 
 post_install_message: