ruby-station 0.1.3 → 0.1.4.rc1

data/tests/features/step_definitions/application_steps.rb

@@ -1,26 +1,73 @@
-Given /^I have '(.*) (.*)'$/ do |name, version|
-  GemManager.installed?(name, version)
+def find_app(name, version)
+  Application.first(:name => name, :version => version)
+end
+
+def install_hello(name, version)
+  raise "wrong gem name" unless name == "hello-ruby-station"
+  Application.install(:file, hello_gem_path(version))
+end
+
+def data_dir_of(name, version)
+  File.expand_path("#{name}-#{version}", Conf.data_dir)
+end
+
+def test_txt_path(name, version)
+  File.expand_path("test.txt", data_dir_of(name, version))
+end
+
+Given /^I have '(.*) (.*)'( and its data)?$/ do |name, version, data|
+  unless find_app(name, version)
+    install_hello(name, version)
+  end
+  if data
+    File.open(test_txt_path(name, version), "w"){|f|
+      # Note: content of test data file should be unique
+      f.puts version
+    }
+  end
 end
 
 Given /^I do not have '(.*) (.*)'$/ do |name, version|
-  if GemManager.installed?(name, version)
-    GemManager.uninstall(name, version)
+  if app = find_app(name, version)
+    app.uninstall
   end
 end
 
 When /^I install '(.*) (.*)'$/ do |name, version|
-  pending
+  install_hello(name, version)
 end
 
 Then /^I should (?:still )?have '(.*) (.*)'$/ do |name, version|
-  GemManager.installed?(name, version).should be_true
+  app = find_app(name, version)
+  Ramaze::Log.error Application.all if app.nil? 
+  app.should_not be_nil
 end
 
 Then /^I should not have '(.*) (.*)'$/ do |name, version|
-  GemManager.installed?(name, version).should be_false
+  find_app(name, version).should be_nil
+end
+
+def files_of(dir)
+  Dir["#{dir}/**"].map{|path| path.sub(dir, "")}
+end
+
+Then /^data files of '(.*) (.*)' should exist$/ do |name, version|
+  Dir.entries(data_dir_of(name, version)).should_not be_empty
 end
 
-Then /^data files of 'hello 0\.2\.0' is same as data files of 'hello 0\.1\.0'$/ do
-    pending
+Then /^data files of '(.*) (.*)' should not exist$/ do |name, version|
+  File.exist?(data_dir_of(name, version)).should be_false
 end
 
+Then /^data files of '(.*) (.*)' is same as '(.*) (.*)'/ do |n1, v1, n2, v2|
+  files1 = files_of(data_dir_of(n1, v1)).sort
+  files2 = files_of(data_dir_of(n2, v2)).sort
+  files1.should == files2
+
+  files1.each do |rel_path|
+    path1 = File.join(data_dir_of(n1, v1), rel_path)
+    path2 = File.join(data_dir_of(n2, v2), rel_path)
+
+    File.read(path1).should == File.read(path2)
+  end
+end

data/tests/features/step_definitions/{curelity_steps.rb → culerity_steps.rb}

@@ -1,6 +1,7 @@
+require 'timeout' # for culerity's bug on 1.9 
 require 'tempfile'
+gem 'culerity', '>= 0.2.3'
 require 'culerity'
-require __DIR__('../../test_helper.rb')
 
 Before do
   # TODO: start ramaze app in 7001, in test environment
@@ -27,6 +28,11 @@ at_exit do
   #Process.kill(6, $rails_server.pid.to_i) if $rails_server
 end
 
+When /I press the uninstall button of '(.*) (.*)'/ do |name, version|
+  $browser.cell(:id, "uninstall-#{name}-#{version}").link(:text, //).click
+  assert_successful_response
+end
+
 When /I press '(.*)'/ do |value|
   $browser.button(:value, value).click
   assert_successful_response
@@ -86,7 +92,7 @@ Then /I should see '(.*)'/ do |text|
   begin
     div.html
   rescue
-    #puts $browser.html
+    puts $browser.html
     raise("div with '#{text}' not found")
   end
 end

data/tests/features/support/env.rb

@@ -6,7 +6,7 @@ gem 'rack-test', '>= 0.5.0'
 gem 'webrat', '>= 0.5.3'
 
 require 'ramaze'
-Ramaze.options.started = true
+#Ramaze.options.started = true
 require __DIR__("../../test_helper.rb")
 load TESTS_DIR/"../bin/ruby-station"
 

data/tests/features/uninstall.feature

@@ -4,10 +4,9 @@ Feature: Uninstall
   I want to uninstall an unused application
 
   Scenario: Uninstall a gem
-    Given I visit the index page
-    When I press the uninstall link
-#    Given I visit the calculator page
-#    And I fill in '50' for 'first'
-#    And I fill in '70' for 'second'
-#    When I press 'Add'
-#    Then I should see 'Answer: 120'
+    Given I have 'hello-ruby-station 0.3.1' and its data
+    And I visit the index page
+    When I press the uninstall button of 'hello-ruby-station 0.3.1'
+    And I wait while the spinner is shown
+    Then I should not have 'hello-ruby-station 0.3.1'
+    And data files of 'hello-ruby-station 0.3.1' should not exist

data/tests/features/upgrade.feature

@@ -3,9 +3,11 @@ Feature: Upgrade
   As an application user
   I want to install the new version
 
-  Scenario: Upgrade a gem
-    Given I have 'hello 0.1.0'
-    And I do not have 'hello 0.2.0'
-    When I install 'hello 0.2.0'
-    Then I should still have 'hello 0.1.0'
-    And data files of 'hello 0.2.0' is same as data files of 'hello 0.1.0'
+  Scenario: Upgrading a gem
+    Given I have 'hello-ruby-station 0.3.0' and its data
+    And I have 'hello-ruby-station 0.3.1' and its data
+    And I do not have 'hello-ruby-station 0.3.2'
+    When I install 'hello-ruby-station 0.3.2'
+    Then I should still have 'hello-ruby-station 0.3.0'
+    And I should still have 'hello-ruby-station 0.3.1'
+    And data files of 'hello-ruby-station 0.3.2' is same as 'hello-ruby-station 0.3.1'

data/tests/spec/application.rb

@@ -0,0 +1,51 @@
+require 'ramaze'
+require __DIR__("../test_helper.rb")
+require TESTS_DIR/"../config.rb"
+require TESTS_DIR/"../model/init.rb"
+require TESTS_DIR/"../util/servant.rb"
+
+def install_hello(version)
+  Application.install(:file, hello_gem_path(version))
+  hello_app(version)
+end
+
+def hello_app(version)
+  Application.first(:name => "hello-ruby-station", 
+                    :version => version)
+end
+
+describe Application do
+  it "should be created by GemManager" do
+    app = install_hello("0.3.2")
+
+    app.should_not be_nil
+    app.port.should be_kind_of(Integer)
+    app.pid.should be_nil
+
+    Application.all(:name => "hello-ruby-station", 
+                    :version => "0.3.2").size.should == 1
+  end
+
+  it "should be removed by GemManager" do
+    install_hello("0.3.2") unless hello_app("0.3.2") 
+    hello_app("0.3.2").uninstall
+
+    hello_app("0.3.2").should be_nil
+    GemManager.installed?("hello-ruby-station", "0.3.2").should be_false
+  end
+
+  it "should start an app" do
+    app = hello_app("0.3.2") || install_hello("0.3.2")
+
+    app.start
+    app.pid.should_not be_nil
+  end
+
+  it "should stop an app" do
+    app = hello_app("0.3.2") || install_hello("0.3.2")
+
+    app.stop
+    app.pid.should be_nil
+  end
+end
+

data/tests/spec/gem_manager.rb

@@ -1,27 +1,39 @@
-require "#{File.dirname(__FILE__)}/../test_helper.rb"
+require 'ramaze'
+require __DIR__("../test_helper.rb")
+require TESTS_DIR/"../config.rb"
 require TESTS_DIR/"../util/gem_manager.rb"
 
-# helpers
+def data_dir_of(name, version)
+  File.expand_path("#{name}-#{version}", TESTS_DIR/"tmp/data/")
+end
 
 describe GemManager do
   it "should install a gem via file" do
-    path = TESTS_DIR/"data/hello/pkg/hello-0.2.0.gem"
-    result, name, version = GemManager.install_file(path)
+    result, name, version = GemManager.install_file(hello_gem_path("0.3.2"))
 
     result.should be_instance_of(String)
-    name.should == "hello"
-    version.should == "0.2.0"
+    name.should == "hello-ruby-station"
+    version.should == "0.3.2"
 
-    GemManager.installed?("hello", "0.2.0").should be_true
+    GemManager.installed?("hello-ruby-station", "0.3.2").should be_true
+    File.exist?(data_dir_of("hello-ruby-station", "0.3.2")).should be_true
   end
 
   it "should install a gem via network" do
-    pending
+    result, name, version = GemManager.install_gem("hello-ruby-station")
+
+    result.should be_instance_of(String)
+    name.should == "hello-ruby-station"
+    version.should == "0.3.0"
+
+    GemManager.installed?("hello-ruby-station", "0.3.0").should be_true
+    File.exist?(data_dir_of("hello-ruby-station", "0.3.2")).should be_true
   end
   
   it "should uninstall a gem" do
-    GemManager.uninstall("hello", "0.2.0")
+    GemManager.uninstall("hello-ruby-station", "0.3.2")
 
-    GemManager.installed?("hello", "0.2.0").should be_false
+    GemManager.installed?("hello-ruby-station", "0.3.2").should be_false
+    File.exist?(data_dir_of("hello-ruby-station", "0.3.2")).should be_false
   end
 end

data/tests/spec/servant.rb

@@ -0,0 +1,33 @@
+require 'ramaze'
+require __DIR__("../../util/servant.rb")
+
+describe Servant do
+  def sleeper_cmd(seconds)
+    "ruby -e '#{seconds}.times{ sleep 1 }'"
+  end
+
+  context "when starting a process" do
+    it "should return the process-id" do
+      pid = Servant.watch(sleeper_cmd(5))
+      pid.should be_kind_of(Integer)
+    end
+
+    it "should call the block on termination" do
+      value = nil
+      pid = Servant.watch(sleeper_cmd(1)){
+        value = "done"
+      }
+      sleep 2
+      value.should == "done"
+    end
+  end
+
+  it "should kill a process" do
+    prev = Time.now
+    pid = Servant.watch(sleeper_cmd(10))
+    sleep 2
+    Servant.kill(pid)
+    (Time.now - prev).should < 10
+  end
+end
+

data/tests/test_helper.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'ramaze'
-Ramaze.options.started = true
 
 TESTS_DIR = __DIR__
 def TESTS_DIR./(*paths)
@@ -9,19 +8,16 @@ end
 
 def clear_tmp(tmp_dir)
   if File.exist?(tmp_dir)
-    puts "removing all files under #{tmp_dir}..."
-    puts "are you sure? [just push enter if so]"
-    if STDIN.gets.chomp.empty?
-      FileUtils.rm_r(tmp_dir)
-    else
-      raise "user chose not to clear the temporary directory"
-    end
+    puts "removing all files under #{tmp_dir}... [Ctrl-C to stop it]"
+    sleep 2
+    FileUtils.rm_r(tmp_dir)
   else
     Dir.mkdir(tmp_dir)
   end
 end
 
-clear_tmp(TESTS_DIR/"tmp/")
-require TESTS_DIR/"../config.rb"
-Conf.init TESTS_DIR/"data/conf_dir"
+def hello_gem_path(version)
+  TESTS_DIR/"data/hello/pkg/hello-ruby-station-#{version}.gem"
+end
 
+clear_tmp(TESTS_DIR/"tmp/")

data/util/gem_manager.rb

@@ -1,4 +1,9 @@
+require 'fileutils'
+require 'open3'
+
 module GemManager
+  class InstallFailed < StandardError; end
+
   def self.installed?(gemname, version)
     gem_path = File.join(Conf.gem_dir, "gems", "#{gemname}-#{version}")
     exists = File.exist?(gem_path)
@@ -8,10 +13,16 @@ module GemManager
   end
 
   def self.install_file(path)
+    symlinked = false
     begin
       # make symlink
-      newpath = "/tmp/#{File.basename(path, ".gem")}.gem"
-      File.symlink(path, newpath)
+      if path !~ /.gem\z/
+        newpath = "/tmp/#{File.basename(path, ".gem")}.gem"
+        File.symlink(path, newpath)
+        symlinked = true
+      else
+        newpath = path
+      end
 
       # install
       cmd = [
@@ -20,48 +31,68 @@ module GemManager
         "-n", Conf.gem_bin_dir,
         Conf.gem_install_option
       ].join(" ")
-      Ramaze::Log.info cmd
-
-      # execute
-      result = `#{cmd}`
 
-      # make data dir
+      out, _ = gem_install(cmd)
       spec = YAML.load(`gem spec #{path}`)
-      data_dir = File.join(Conf.data_dir, "#{spec.name}-#{spec.version}")
-      unless File.directory?(data_dir)
-        Dir.mkdir(data_dir)
-        Ramaze::Log.info "made data dir for the gem: #{data_dir}"
-      end
+      name, version = spec.name, spec.version.to_s
+      make_data_dir(name, version)
 
-      [result, spec.name, spec.version.to_s]
+      [out, name, version]
     ensure
-      File.unlink(newpath)
+      File.unlink(newpath) if symlinked
     end
   end
 
   def self.install_gem(name)
-    # install
     cmd = [
       Conf.gem_command, "install", name,
       "-i", Conf.gem_dir,
       "-n", Conf.gem_bin_dir,
       Conf.gem_install_option
     ].join(" ")
-    Ramaze::Log.info cmd
     
-    # execute
-    result = `#{cmd}`
+    out, version = gem_install(cmd, name)
+    make_data_dir(name, version)
+
+    [out, name, version]
+  end
 
-    # make data dir
-    raise "installation failed" unless result =~ /installed #{name}-(.*)/
-    version = $1
+  def self.gem_install(cmd, name=nil)
+    Ramaze::Log.info cmd
+    out, err = Open3.popen3(cmd){|i, o, e|
+      [o.read, e.read]
+    }
+
+    name_pattern = name ? "#{name}-" : ""
+    if out !~ /Successfully installed #{name_pattern}(.*)/
+      Ramaze::Log.error "gem install failed: #{err}"
+      raise InstallFailed.new(err)
+    end
+
+    return out, $1
+  end
+
+  def self.make_data_dir(name, version)
     data_dir = File.join(Conf.data_dir, "#{name}-#{version}")
     unless File.directory?(data_dir)
-      Dir.mkdir(data_dir)
-      Ramaze::Log.info "made data dir for the gem: #{data_dir}"
+      if prev_ver = previous_version(name, version)
+        prev_dir = File.join(Conf.data_dir, "#{name}-#{prev_ver}")
+        FileUtils.cp_r(prev_dir, data_dir)
+        Ramaze::Log.info "copied data of #{version} for the gem: #{data_dir}"
+      else
+        Dir.mkdir(data_dir)
+        Ramaze::Log.info "made data dir for the gem: #{data_dir}"
+      end
     end
+  end
+
+  def self.previous_version(name, version)
+    specs_dir = File.join(Conf.gem_dir, "specifications")
+    index = Gem::SourceIndex.new.load_gems_in(specs_dir)
 
-    [result, name, version]
+    req = Gem::Requirement.create("< #{version}")
+    prev_spec = index.find_name(name, req).last
+    return prev_spec ? prev_spec.version.to_s : nil
   end
 
   def self.uninstall(name, version)
@@ -73,6 +104,14 @@ module GemManager
     ].join(" ")
     Ramaze::Log.info cmd
 
+    GemManager.remove_data_dir(name, version)
+
     `#{cmd}`
   end
+
+  def self.remove_data_dir(name, version)
+    data_dir = File.join(Conf.data_dir, "#{name}-#{version}")
+    Ramaze::Log.info "removing application data in #{data_dir}"
+    FileUtils.rm_r(data_dir)
+  end
 end

data/view/applications/uninstall.xhtml

@@ -4,7 +4,7 @@
   <p>uninstalling #{@app.full_name} ..</p>
 
   <pre id="result">
-    <img src='/spinner.gif'>
+    <img id="spinner" src='/spinner.gif'>
   </pre>
 
   <a href='/'>back</a>

data/view/index.xhtml

@@ -35,7 +35,7 @@
               ON</a> / OFF
           </td>
         <?r end ?>
-          <td>
+          <td id="uninstall-#{h app.name}-#{h app.version}">
             #{Applications.a("-", :uninstall, app.id)}
           </td>
       </tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-station
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4.rc1
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 +09:00
+date: 2009-10-18 00:00:00 +09:00
 default_executable: ruby-station
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: "2009.07"
     version: 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.10.1
     version: 
@@ -38,7 +38,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.10.0
     version: 
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -58,9 +58,39 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.101
+        version: 0.4.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: culerity
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
     version: 
 description: Create, Distribute, and Install Ruby applications easily
 email: yutaka.hara/at/gmail.com
@@ -68,11 +98,11 @@ executables:
 - ruby-station
 extensions: []
 
-extra_rdoc_files: 
-- ChangeLog
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- ChangeLog
+- History.txt
 - Rakefile
 - VERSION
 - bin/ruby-station
@@ -93,22 +123,30 @@ files:
 - runtime/Rakefile
 - runtime/VERSION
 - runtime/lib/ruby-station.rb
-- runtime/lib/ruby-station/helper.rb
-- runtime/lib/ruby-station/helper/rails.rb
-- runtime/ruby-station-runtime-0.0.4.gem
+- runtime/ruby-station-runtime-0.0.5.gem
+- runtime/ruby-station-runtime.gemspec
 - sample.config.yaml
 - tests/README
 - tests/Rakefile
+- tests/console.rb
 - tests/data/conf_dir/config.yaml
+- tests/data/hello/hello-ruby-station.gemspec
+- tests/data/hello/main.rb
+- tests/data/hello/pkg/hello-ruby-station-0.3.1.gem
+- tests/data/hello/pkg/hello-ruby-station-0.3.2.gem
+- tests/development/config.yaml
 - tests/features/install_file.feature
 - tests/features/install_name.feature
 - tests/features/list.feature
+- tests/features/reinstall.feature
 - tests/features/step_definitions/application_steps.rb
-- tests/features/step_definitions/curelity_steps.rb
+- tests/features/step_definitions/culerity_steps.rb
 - tests/features/support/env.rb
 - tests/features/uninstall.feature
 - tests/features/upgrade.feature
+- tests/spec/application.rb
 - tests/spec/gem_manager.rb
+- tests/spec/servant.rb
 - tests/test_helper.rb
 - util/gem_manager.rb
 - util/servant.rb

data/ChangeLog

@@ -1,3 +0,0 @@
-2009-08-20  Yutaka HARA  <yhara(at)kmc.gr.jp>
-
-	* new: :debug in config.yaml