ruby-station 0.0.4 → 0.1.0

data/.gitignore

@@ -1,3 +1,2 @@
 pkg
 tmp
-misc

data/Rakefile

@@ -13,9 +13,10 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage = "http://github.com/yhara/#{PROJECT_NAME}"
   gemspec.description = gemspec.summary
   gemspec.authors = ["Yutaka HARA"]
-#  gemspec.add_dependency('ramaze', '= 2009.06.12')
-#  gemspec.add_dependency('dm-core')
-#  gemspec.add_dependency('do_sqlite3')
+  gemspec.add_dependency('ramaze', '= 2009.07')
+  gemspec.add_dependency('dm-core')
+  gemspec.add_dependency('do_sqlite3')
+  gemspec.add_development_dependency('rspec', '= 1.2.8')
 end
 
 desc "install current source as gem"

data/bin/ruby-station

@@ -6,14 +6,22 @@ require 'ramaze'
 
 $LOAD_PATH.unshift __DIR__("../")
 
-require 'util/gem-manager.rb'
+require 'util/gem_manager.rb'
 require 'config.rb'
-Conf.parse_opt
+if defined?(TESTS_DIR)
+  Conf.set_home(TESTS_DIR/"data/conf_dir/")
+else
+  Conf.parse_opt
+end
 Conf.init
 
+require 'util/servant.rb'
 require 'controller/init'
 require 'model/init'
 
+if Conf.debug
+  Ramaze::Log.info "Starting Ramaze with dev mode"
+end
 Ramaze.start :port => Conf.server_port,
              :root => __DIR__("../"),
-             :mode => :live
+             :mode => (Conf.debug ? :dev : :live)

data/config.rb

@@ -1,3 +1,4 @@
+require __DIR__("./util/gem_manager")
 require 'yaml'
 require 'fileutils'
 
@@ -9,7 +10,7 @@ module RubyStation
 end
 
 class Conf
-  %w(ruby_command gem_command gem_dir gem_bin_dir gem_install_option data_dir server_port).each do |m|
+  %w(ruby_command gem_command gem_dir gem_bin_dir gem_install_option data_dir server_port debug).each do |m|
     class_eval <<-EOD
       def self.#{m}; @yaml[:#{m}]; end
     EOD
@@ -34,6 +35,11 @@ class Conf
     @opt.parse!(ARGV)
   end
 
+  # for unit tests
+  def self.set_home(path)
+    @home = path
+  end
+
   def self.load_yaml
     yaml_path = File.join(@home, "config.yaml")
     unless File.exist?(yaml_path)
@@ -47,7 +53,8 @@ class Conf
   end
 
   # TODO: refactor X-(
-  def self.init
+  def self.init(home=nil)
+    @home = home if home
     @yaml = self.load_yaml
     @yaml[:gem_dir] = File.expand_path(@yaml[:gem_dir], @home)
     @yaml[:gem_bin_dir] = File.expand_path(@yaml[:gem_bin_dir], @home)
@@ -56,15 +63,26 @@ class Conf
     FileUtils.makedirs(@yaml[:gem_bin_dir])
     FileUtils.makedirs(@yaml[:data_dir])
 
-    runtime_ver = RubyStation::RUNTIME_VERSION
-    unless GemManager.installed?("ruby-station-runtime", runtime_ver)
-      gem_path = __DIR__("runtime/ruby-station-runtime-#{runtime_ver}.gem")
-      GemManager.install_file(gem_path)
-    end
+    Runtime.install unless Runtime.installed?
+
 #    unless `#{self.gem_command} sources`.include?("github")
 #      cmd = "#{self.gem_command} sources -a http://gems.github.com"
 #      Ramaze::Log.info cmd
 #      `#{cmd}`
 #    end
   end
+
+  module Runtime
+    VERSION = RubyStation::RUNTIME_VERSION
+
+    def self.installed?
+      GemManager.installed?("ruby-station-runtime", VERSION)
+    end
+    
+    def self.install
+      path = __DIR__("runtime/ruby-station-runtime-#{VERSION}.gem")
+      GemManager.install_file(path)
+    end
+
+  end
 end

data/controller/applications.rb

@@ -1,33 +1,46 @@
+require 'json'
+
 class Applications < Controller
   map '/applications'
+  provide :json, :type => "application/json" do |action, value|
+    value.to_json
+  end
 
   layout{|path, ext|
-    "default" unless path =~ /\Ado_/
+    "default" unless path =~ /\A_/
   }
 
   def install
-    if request["name"]
+    session[:source_type] = request["by"]
+
+    case session[:source_type]
+    when "name"
       @name = request["name"]
       session[:gemname] = @name
-    else
+      session[:messages] = []
+    when "file"
       tempfile = request["gem"][:tempfile]
       @filename = request["gem"][:filename]
       @size = tempfile.size
       session[:tempfile] = tempfile
+    else
+      raise "unknown install source type: #{session[:source_type]}"
     end
   end
 
-  def do_install
-    if gemname = session[:gemname]
+  def _install
+    case session[:source_type]
+    when "name"
+      gemname = session[:gemname]
       result, name, version = GemManager.install_gem(gemname)
-    elsif session[:tempfile]
+    when "file"
       path = session[:tempfile].path
       result, name, version = GemManager.install_file(path)
     else
-      raise
+      raise "unknown install source type: #{session[:source_type]}"
     end
 
-    unless Application.first(:name => name, :version => version)
+    if result and not Application.first(:name => name, :version => version)
       Application.create({
         :pid => nil,
         :port => 30000 + rand(9999),
@@ -40,26 +53,23 @@ class Applications < Controller
     h result
   end
 
-  def create
-  end
-
-  def show(name)
-  end
-
   def uninstall(id)
-    app = Application.get(id)
-    raise "application not found(id=#{id})" unless app
-
-    @app = app
+    if app = Application.get(id)
+      @app = app
+    else
+      flash[:error] = "The application (id=#{id}) is already uninstalled."
+      redirect MainController.r(:notfound)
+    end
   end
 
-  def do_uninstall(id)
-    app = Application.get(id)
-    raise "application not found(id=#{id})" unless app
-
-    result = GemManager.uninstall(app.name, app.version)
-    app.destroy
-    result
+  def _uninstall(id)
+    if app = Application.get(id)
+      result = GemManager.uninstall(app.name, app.version)
+      app.destroy
+      result
+    else
+      ""
+    end
   end
 
   def start(id)
@@ -80,5 +90,4 @@ class Applications < Controller
 
     redirect_referer
   end
-
 end

data/controller/main.rb

@@ -5,4 +5,11 @@ class MainController < Controller
     @applications = Application.all
   end
 
+  def notfound
+    # Note: workaround for ramaze 2009.07
+    # response.status = 404
+    
+    @message = flash[:error] || "The page you requested is not found."
+  end
+
 end

data/model/application.rb

@@ -1,8 +1,5 @@
-require 'ramaze/tool/bin'
-
 class Application
   include DataMapper::Resource
-  include Ramaze::Tool::Bin::Helpers
 
   property :id, Serial
   property :pid, Integer
@@ -20,24 +17,17 @@ class Application
       "--data-dir", data_dir,
     ].join(" ")
 
-    self.pid = fork {
-      exec(cmd)
+    self.pid = Servant.watch(cmd){
+      stopped
     }
     self.save
   end
 
   def stop
-    return unless self.pid
-
-    Process.kill("INT", self.pid)
-    if is_running?(self.pid)
-      sleep 2
-      Ramaze::Log.warn "Process #{self.pid} did not die, forcing it with -9"
-      Process.kill(9, self.pid)
+    if self.pid
+      Servant.kill(self.pid)
+      stopped
     end
-
-    self.pid = nil
-    self.save
   end
 
   def full_name
@@ -46,6 +36,11 @@ class Application
 
   private
 
+  def stopped
+    self.pid = nil
+    self.save
+  end
+
   def script_path
     File.join(Conf.gem_dir, "gems",
               full_name, "main.rb")

data/ruby-station.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-station}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-08-15}
+  s.date = %q{2009-10-02}
   s.default_executable = %q{ruby-station}
   s.description = %q{Create, Distribute, and Install Ruby applications easily}
   s.email = %q{yutaka.hara/at/gmail.com}
@@ -35,32 +35,55 @@ Gem::Specification.new do |s|
      "runtime/lib/ruby-station.rb",
      "runtime/lib/ruby-station/helper.rb",
      "runtime/lib/ruby-station/helper/rails.rb",
-     "runtime/ruby-station-runtime-0.0.3.gem",
      "runtime/ruby-station-runtime-0.0.4.gem",
      "sample.config.yaml",
-     "spec/main.rb",
-     "util/gem-manager.rb",
+     "tests/README",
+     "tests/Rakefile",
+     "tests/data/conf_dir/config.yaml",
+     "tests/features/install_file.feature",
+     "tests/features/install_name.feature",
+     "tests/features/list.feature",
+     "tests/features/step_definitions/application_steps.rb",
+     "tests/features/step_definitions/curelity_steps.rb",
+     "tests/features/support/env.rb",
+     "tests/features/uninstall.feature",
+     "tests/features/upgrade.feature",
+     "tests/spec/gem_manager.rb",
+     "tests/test_helper.rb",
+     "util/gem_manager.rb",
+     "util/servant.rb",
      "view/applications/do_install.xhtml",
+     "view/applications/foo.xhtml",
      "view/applications/install.xhtml",
      "view/applications/uninstall.xhtml",
-     "view/index.xhtml"
+     "view/index.xhtml",
+     "view/notfound.xhtml"
   ]
   s.homepage = %q{http://github.com/yhara/ruby-station}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Create, Distribute, and Install Ruby applications easily}
-  s.test_files = [
-    "spec/main.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ramaze>, ["= 2009.07"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
+      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.2.8"])
     else
+      s.add_dependency(%q<ramaze>, ["= 2009.07"])
+      s.add_dependency(%q<dm-core>, [">= 0"])
+      s.add_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 1.2.8"])
     end
   else
+    s.add_dependency(%q<ramaze>, ["= 2009.07"])
+    s.add_dependency(%q<dm-core>, [">= 0"])
+    s.add_dependency(%q<do_sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 1.2.8"])
   end
 end

data/sample.config.yaml

@@ -2,6 +2,6 @@
 :gem_command: "gem"
 :gem_dir: "./gem_home"
 :gem_bin_dir: "./gem_bin"
-:gem_install_option: "--no-rdoc --no-ri"
+:gem_install_option: "--no-rdoc --no-ri --verbose"
 :data_dir: "./data"
 :server_port: 2534

data/tests/README

@@ -0,0 +1,29 @@
+Unit tests for RubyStation
+==========================
+
+spec
+----
+
+    $ gem intall rspec
+
+rspec spec/*
+
+
+features
+--------
+
+1. install cucumber:
+    $ gem install cucumber
+
+2. install jruby:
+    TODO
+
+JRuby must be executable by 'jruby'.
+
+3. install culerity:
+    $ gem install langalex-culerity --source http://gems.github.com
+
+
+
+
+

data/tests/Rakefile

@@ -0,0 +1,11 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end
+
+desc "run rspec"
+task "spec" do
+  sh "spec spec/*.rb"
+end

data/tests/data/conf_dir/config.yaml

@@ -0,0 +1,7 @@
+:ruby_command: "ruby"
+:gem_command: "gem"
+:gem_dir: "../../tmp/gem_home"
+:gem_bin_dir: "../../tmp/gem_bin"
+:gem_install_option: "--no-rdoc --no-ri --verbose"
+:data_dir: "../../tmp/data"
+:server_port: 25341

data/tests/features/install_file.feature

@@ -0,0 +1,14 @@
+Feature: Install by file
+  In order to test new applications
+  As an application developer
+  I want to install a new gem file
+
+  Scenario: Install a gem by file
+    Given I do not have 'hello 0.2.0'
+    And I visit the index page
+    And I check 'by file'
+    And I fill in the path of 'data/hello/pkg/hello-0.2.0.gem' for 'gem'
+    When I press 'install'
+    And I wait while the spinner is shown
+    Then I should see 'Installing'
+    And I should have 'hello 0.2.0'

data/tests/features/install_name.feature

@@ -0,0 +1,13 @@
+Feature: Install by name
+  In order to use new applications
+  As an application user
+  I want to install a new application
+
+  Scenario: Install a gem by name
+    Given I do not have 'hello-ruby-station 0.3.0'
+    And I visit the index page
+    And I fill in 'hello-ruby-station' for 'name'
+    When I press 'install'
+    And I wait while the spinner is shown
+    Then I should see 'Installing'
+    And I should have 'hello-ruby-station 0.3.0'

data/tests/features/list.feature

@@ -0,0 +1,11 @@
+Feature: List
+  In order to know which application is installed
+  As an application user
+  I want to list my applications
+
+  Scenario: View the list of applications
+    Given I visit the index 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'

data/tests/features/step_definitions/application_steps.rb

@@ -0,0 +1,26 @@
+Given /^I have '(.*) (.*)'$/ do |name, version|
+  GemManager.installed?(name, version)
+end
+
+Given /^I do not have '(.*) (.*)'$/ do |name, version|
+  if GemManager.installed?(name, version)
+    GemManager.uninstall(name, version)
+  end
+end
+
+When /^I install '(.*) (.*)'$/ do |name, version|
+  pending
+end
+
+Then /^I should (?:still )?have '(.*) (.*)'$/ do |name, version|
+  GemManager.installed?(name, version).should be_true
+end
+
+Then /^I should not have '(.*) (.*)'$/ do |name, version|
+  GemManager.installed?(name, version).should be_false
+end
+
+Then /^data files of 'hello 0\.2\.0' is same as data files of 'hello 0\.1\.0'$/ do
+    pending
+end
+

data/tests/features/step_definitions/curelity_steps.rb

@@ -0,0 +1,117 @@
+require 'tempfile'
+require 'culerity'
+require __DIR__('../../test_helper.rb')
+
+Before do
+  # TODO: start ramaze app in 7001, in test environment
+#  unless $rails_server
+#    $rails_server = Culerity::run_rails
+#    sleep 5
+#  end
+  
+  # invoke jruby eval server (communicate via pipe)
+  # the server has instances of Celerity::Browser
+  $server ||= Culerity::run_server
+
+  # get the viatual browser, running in the server
+  $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox}
+
+  # is needed to open pages
+  @host = "http://localhost:#{Conf.server_port}"
+end
+
+at_exit do
+  $browser.exit if $browser
+  $server.exit_server if $server
+  # TODO: stop ramaze app
+  #Process.kill(6, $rails_server.pid.to_i) if $rails_server
+end
+
+When /I press '(.*)'/ do |value|
+  $browser.button(:value, value).click
+  assert_successful_response
+end
+
+When /I follow '(.*)'/ do |link|
+  $browser.link(:text, /#{link}/).click
+  assert_successful_response
+end
+
+When /I fill in '(.*)' for '(.*)'/ do |value, name|
+  $browser.text_field(:name, name).set(value)
+end
+
+When /I fill in the path of '(.*)' for '(.*)'/ do |file, name|
+  $browser.file_field(:name, name).set(TESTS_DIR/file)
+end
+
+When /I check '(.*)'/ do |field|
+  $browser.check_box(:id, find_label(field).for).set(true)
+end
+
+When /^I uncheck '(.*)'$/ do |field|
+  $browser.check_box(:id, find_label(field).for).set(false)
+end
+
+When /I select '(.*)' from '(.*)'/ do |value, field|
+  $browser.select_list(:id, find_label(field).for).select value
+end
+
+When /I choose '(.*)'/ do |field|
+  $browser.radio(:id, find_label(field).for).set(true)
+end
+
+When /I visit the (.+) page/ do |name|
+  path = case name
+         when 'index' then '/'
+         else raise "unknown page name: #{name}"
+         end
+  $browser.goto "#{@host}#{path}"
+  assert_successful_response
+end
+
+When /I wait while the spinner is shown/ do
+  $browser.wait_while(60 * 3){ # 3 minutes
+    $browser.image(:id, 'spinner').exist?
+  }
+end
+
+When /I wait for the AJAX call to finish/ do
+  $browser.wait
+end
+
+Then /I should see '(.*)'/ do |text|
+  # if we simply check for the browser.html content we don't find content that has been added dynamically, e.g. after an ajax call
+  div = $browser.div(:text, /#{text}/)
+  begin
+    div.html
+  rescue
+    #puts $browser.html
+    raise("div with '#{text}' not found")
+  end
+end
+
+Then /I should not see '(.*)'/ do |text|
+  div = $browser.div(:text, /#{text}/).html rescue nil
+  div.should be_nil
+end
+
+def find_label(text)
+  $browser.label :text, text
+end
+
+def assert_successful_response
+  status = $browser.page.web_response.status_code
+  if(status == 302 || status == 301)
+    location = $browser.page.web_response.get_response_header_value('Location')
+    puts "Being redirected to #{location}"
+    $browser.goto location
+    assert_successful_response
+  elsif status != 200
+    tmp = Tempfile.new 'culerity_results'
+    tmp << $browser.html
+    tmp.close
+    `open -a /Applications/Safari.app #{tmp.path}`
+    raise "Brower returned Response Code #{$browser.page.web_response.status_code}"
+  end
+end

data/tests/features/support/env.rb

@@ -0,0 +1,33 @@
+# See http://wiki.github.com/aslakhellesoy/cucumber/ramaze
+# for more details about Ramaze with Cucumber
+
+gem 'ramaze', '>= 2009.07'
+gem 'rack-test', '>= 0.5.0'
+gem 'webrat', '>= 0.5.3'
+
+require 'ramaze'
+Ramaze.options.started = true
+require __DIR__("../../test_helper.rb")
+load TESTS_DIR/"../bin/ruby-station"
+
+require 'spec/expectations'
+require 'rack/test'
+require 'webrat'
+
+Webrat.configure do |config|
+  config.mode = :rack
+end
+
+class MyWorld
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+
+  Webrat::Methods.delegate_to_session :response_code, :response_body
+
+  def app
+    Ramaze::middleware
+  end
+end
+
+World{MyWorld.new}

data/tests/features/uninstall.feature

@@ -0,0 +1,13 @@
+Feature: Uninstall
+  In order to clean my application list
+  As an application user
+  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'

data/tests/features/upgrade.feature

@@ -0,0 +1,11 @@
+Feature: Upgrade
+  In order to use new version of an application
+  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'

data/tests/spec/gem_manager.rb

@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/../test_helper.rb"
+require TESTS_DIR/"../util/gem_manager.rb"
+
+# helpers
+
+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.should be_instance_of(String)
+    name.should == "hello"
+    version.should == "0.2.0"
+
+    GemManager.installed?("hello", "0.2.0").should be_true
+  end
+
+  it "should install a gem via network" do
+    pending
+  end
+  
+  it "should uninstall a gem" do
+    GemManager.uninstall("hello", "0.2.0")
+
+    GemManager.installed?("hello", "0.2.0").should be_false
+  end
+end

data/tests/test_helper.rb

@@ -0,0 +1,27 @@
+require 'fileutils'
+require 'ramaze'
+Ramaze.options.started = true
+
+TESTS_DIR = __DIR__
+def TESTS_DIR./(*paths)
+  File.expand_path(File.join(*paths), TESTS_DIR)
+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
+  else
+    Dir.mkdir(tmp_dir)
+  end
+end
+
+clear_tmp(TESTS_DIR/"tmp/")
+require TESTS_DIR/"../config.rb"
+Conf.init TESTS_DIR/"data/conf_dir"
+

data/util/{gem-manager.rb → gem_manager.rb}

@@ -53,7 +53,7 @@ module GemManager
     result = `#{cmd}`
 
     # make data dir
-    raise unless result =~ /installed #{name}-(.*)/
+    raise "installation failed" unless result =~ /installed #{name}-(.*)/
     version = $1
     data_dir = File.join(Conf.data_dir, "#{name}-#{version}")
     unless File.directory?(data_dir)

data/util/servant.rb

@@ -0,0 +1,56 @@
+require 'open3'
+require 'ramaze/tool/bin'
+
+# class Servant provides process invocations.
+#
+# @example
+#   pid = Servant.watch("some-app -p 12345"){
+#     # this block is called when app finishes
+#   }
+#
+#   Servant.kill(pid) #=> stop the app immediately
+#
+#   Servant.communicate("gem install foobar"){|line|
+#     # each line is yielded form process
+#   }
+class Servant
+  extend Ramaze::Tool::Bin::Helpers # provides is_running?
+
+  def self.watch(cmd, args=[], &block)
+    begin
+      pid = Process.spawn(cmd, *args)
+    rescue SystemCallError
+      return nil
+    end
+
+    Thread.new{
+      Process.waitpid(pid)
+      block.call
+    }
+    return pid
+  end
+
+  def self.communicate(cmd, args=[])
+    command = cmd + args.map{|x| ' '+x}.join
+    Open3.popen3(command){|stdin, stdout, stderr|
+      stdin.close
+      while line = stdout.gets
+        yield line
+      end
+      while line = stderr.gets
+        yield line
+      end
+    }
+  end
+
+  def self.kill(pid)
+    Process.kill("INT", pid)
+
+    if is_running?(pid)
+      sleep 2
+      Ramaze::Log.warn "Process #{pid} did not die, forcing it with -9"
+      Process.kill(9, pid)
+    end
+  end
+
+end

data/view/applications/foo.xhtml

@@ -0,0 +1,19 @@
+<h3>foo</h3>
+<div id="result">
+  waiting..
+</div>
+<script>
+  $(function(){
+    $.get("#{r :_foo_gen}");
+    var loop = function(){
+      $.getJSON("#{r '_foo_get.json'}", function(result){
+        console.debug(result[0], result[1]);
+        $("#result").append(result[1]);
+        if (!result[0]) {
+          setTimeout(loop, 2000);
+        }
+      });
+    };
+    loop();
+  });
+</script>

data/view/applications/install.xhtml

@@ -1,6 +1,10 @@
 <div id="install">
   <h2>Installing application</h2>
 
+  <p>
+  This may take some minutes. Please be patient.
+  </p>
+
   <?r if @name ?>
     <p>Installing gem '#{@name}'...</p>
   <?r else ?>
@@ -8,7 +12,7 @@
   <?r end ?>
 
   <pre id="result">
-    <img src='/spinner.gif'>
+    <img id="spinner" src='/spinner.gif'>
   </pre>
 
   <a href='/'>back</a>
@@ -16,6 +20,6 @@
 
 <script type="text/javascript">
   $(document).ready(function(){
-    $("#result").load("#{r(:do_install)}");
+    $("#result").load("#{r(:_install)}");
   });
 </script>

data/view/applications/uninstall.xhtml

@@ -1,5 +1,5 @@
 <div id="uninstall">
-  <h2>アプリケーションの削除</h2>
+  <h2>Uninstall</h2>
 
   <p>uninstalling #{@app.full_name} ..</p>
 
@@ -12,6 +12,6 @@
 
 <script type="text/javascript">
   $(document).ready(function(){
-    $("#result").load("#{r(:do_uninstall, @app.id)}");
+    $("#result").load("#{r(:_uninstall, @app.id)}");
   });
 </script>

data/view/index.xhtml

@@ -45,35 +45,35 @@
 </div>
 <div id="new">
   <h2>Installing Applications</h2>
-  <input type="radio" id="by_name_button" checked>
-  <label for="by_name_button">by name</label>
-  <input type="radio" id="by_file_button">
-  <label for="by_file_button">by file</label>
+  <form action="#{Applications.r(:install)}" method="POST" enctype="multipart/form-data">
+    <input type="radio" name="by" value="name" id="by_name_button" checked>
+    <label for="by_name_button">by name</label>
+    <input type="radio" name="by" value="file" id="by_file_button">
+    <label for="by_file_button">by file</label>
 
-  <div id="by_name">
-    <form action="#{Applications.r(:install)}" method="POST" enctype="multipart/form-data">
+    <div id="by_name">
       <input type="text" name="name" size="30">
       <input type="submit" value="install">
-    </form>
-  </div>
+    </div>
 
-  <div id="by_file" style="display: none;">
-    <form action="#{Applications.r(:install)}" method="POST" enctype="multipart/form-data">
+    <div id="by_file" style="display: none;">
       <input type="file" name="gem" size="50">
       <input type="submit" value="install">
-    </form>
-  </div>
+    </div>
+  </form>
 </div>
 
 <script type="text/javascript">
 $(function(){
-  $("#by_name_button").change(function(){
+  $("#by_name_button").click(function(){
     $("#by_name").show();
     $("#by_file").hide();
+    return true;
   });
-  $("#by_file_button").change(function(){
+  $("#by_file_button").click(function(){
     $("#by_name").hide();
     $("#by_file").show();
+    return true;
   });
 });
 </script>

data/view/notfound.xhtml

@@ -0,0 +1,3 @@
+<div>
+  #{h @message}
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-station
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,10 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 +09:00
+date: 2009-10-02 00:00:00 +09:00
 default_executable: ruby-station
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ramaze
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "2009.07"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.8
+    version: 
 description: Create, Distribute, and Install Ruby applications easily
 email: yutaka.hara/at/gmail.com
 executables: 
@@ -45,15 +84,29 @@ files:
 - runtime/lib/ruby-station.rb
 - runtime/lib/ruby-station/helper.rb
 - runtime/lib/ruby-station/helper/rails.rb
-- runtime/ruby-station-runtime-0.0.3.gem
 - runtime/ruby-station-runtime-0.0.4.gem
 - sample.config.yaml
-- spec/main.rb
-- util/gem-manager.rb
+- tests/README
+- tests/Rakefile
+- tests/data/conf_dir/config.yaml
+- tests/features/install_file.feature
+- tests/features/install_name.feature
+- tests/features/list.feature
+- tests/features/step_definitions/application_steps.rb
+- tests/features/step_definitions/curelity_steps.rb
+- tests/features/support/env.rb
+- tests/features/uninstall.feature
+- tests/features/upgrade.feature
+- tests/spec/gem_manager.rb
+- tests/test_helper.rb
+- util/gem_manager.rb
+- util/servant.rb
 - view/applications/do_install.xhtml
+- view/applications/foo.xhtml
 - view/applications/install.xhtml
 - view/applications/uninstall.xhtml
 - view/index.xhtml
+- view/notfound.xhtml
 has_rdoc: true
 homepage: http://github.com/yhara/ruby-station
 licenses: []
@@ -82,5 +135,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Create, Distribute, and Install Ruby applications easily
-test_files: 
-- spec/main.rb
+test_files: []
+

data/spec/main.rb

@@ -1,25 +0,0 @@
-require 'ramaze'
-require 'ramaze/spec/helper'
-
-require __DIR__('../start')
-
-describe MainController do
-  behaves_like 'http', 'xpath'
-  ramaze :view_root => __DIR__('../view'),
-         :public_root => __DIR__('../public')
-
-  it 'should show start page' do
-    got = get('/')
-    got.status.should == 200
-    puts got.body
-    got.at('//title').text.strip.should ==
-      MainController.new.index
-  end
-
-  it 'should show /notemplate' do
-    got = get('/notemplate')
-    got.status.should == 200
-    got.at('//div').text.strip.should ==
-      MainController.new.notemplate
-  end
-end