ruby-station 0.1.3 → 0.1.4.rc1

data/History.txt

@@ -0,0 +1,21 @@
+2009-10-02 version x x x
+
+  * new: option --version
+  * fix: catch gem errors
+
+2009-10-02 version 0.1.3
+
+	* new: added tests
+  * new: support ruby 1.8 on unixes
+
+2009-08-15 version 0.0.4
+
+  * new: added runtime library for applications
+
+2009-08-13 version 0.0.3
+
+  * fix: save ruby-station.db in @home
+
+2009-07-19 version 0.0.2
+
+  * initial version

data/Rakefile

@@ -13,11 +13,14 @@ 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.07')
-  gemspec.add_dependency('dm-core', '>= 0.10.1')
-  gemspec.add_dependency('do_sqlite3', '>= 0.10.0')
-  gemspec.add_development_dependency('rspec', '>= 1.2.8')
-  gemspec.add_development_dependency('cucumber', '>= 0.3.101')
+  gemspec.add_dependency('ramaze', '= 2009.07')
+  gemspec.add_dependency('dm-core', '= 0.10.1')
+  gemspec.add_dependency('do_sqlite3', '= 0.10.0')
+  gemspec.add_development_dependency('rspec', '= 1.2.9')
+  gemspec.add_development_dependency('cucumber', '= 0.4.2')
+  gemspec.add_development_dependency('rack-test', '= 0.5.0')
+  gemspec.add_development_dependency('webrat', '= 0.5.3')
+  gemspec.add_development_dependency('culerity', '= 0.2.3')
   gemspec.executables = ["ruby-station"]
 end
 

data/bin/ruby-station

@@ -8,20 +8,23 @@ $LOAD_PATH.unshift __DIR__("../")
 
 require 'util/gem_manager.rb'
 require 'config.rb'
-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"
+def start_ramaze
+  if Conf.debug
+    Ramaze::Log.info "Starting Ramaze with dev mode"
+  end
+  Ramaze::Log.info "Starting Ramaze with port #{Conf.server_port}"
+  Ramaze.start :port => Conf.server_port,
+               :root => __DIR__("../"),
+               :mode => (Conf.debug ? :dev : :live)
+end
+
+if defined?(TESTS_DIR)
+  Thread.new{ start_ramaze }
+else
+  start_ramaze
 end
-Ramaze.start :port => Conf.server_port,
-             :root => __DIR__("../"),
-             :mode => (Conf.debug ? :dev : :live)

data/config.rb

@@ -10,16 +10,13 @@ module RubyStation
 end
 
 class Conf
-  %w(ruby_command gem_command gem_dir gem_bin_dir gem_install_option data_dir server_port debug).each do |m|
+  %w(ruby_command gem_command gem_dir gem_bin_dir data_dir
+     db_path gem_install_option server_port debug).each do |m|
     class_eval <<-EOD
       def self.#{m}; @yaml[:#{m}]; end
     EOD
   end
 
-  def self.db_path
-    File.join(@home, "ruby-station.db")
-  end
-
   def self.parse_opt
     @home = File.expand_path("~/.ruby-station")
 
@@ -64,6 +61,7 @@ class Conf
     @yaml[:gem_dir] = File.expand_path(@yaml[:gem_dir], @home)
     @yaml[:gem_bin_dir] = File.expand_path(@yaml[:gem_bin_dir], @home)
     @yaml[:data_dir] = File.expand_path(@yaml[:data_dir], @home)
+    @yaml[:db_path] = File.expand_path(@yaml[:db_path], @home)
     FileUtils.makedirs(@yaml[:gem_dir])
     FileUtils.makedirs(@yaml[:gem_bin_dir])
     FileUtils.makedirs(@yaml[:data_dir])
@@ -91,3 +89,10 @@ class Conf
 
   end
 end
+
+if defined?(TESTS_DIR)
+  Conf.set_home(TESTS_DIR/"data/conf_dir/")
+else
+  Conf.parse_opt
+end
+Conf.init

data/controller/applications.rb

@@ -29,28 +29,22 @@ class Applications < Controller
   end
 
   def _install
-    case session[:source_type]
-    when "name"
-      gemname = session[:gemname]
-      result, name, version = GemManager.install_gem(gemname)
-    when "file"
-      path = session[:tempfile].path
-      result, name, version = GemManager.install_file(path)
-    else
-      raise "unknown install source type: #{session[:source_type]}"
-    end
-
-    if result and not Application.first(:name => name, :version => version)
-      Application.create({
-        :pid => nil,
-        :port => 30000 + rand(9999),
-        :name => name,
-        :version => version,
-      })
+    result = ""
+    begin
+      case session[:source_type]
+      when "name"
+        result = Application.install(:name, session[:gemname])
+      when "file"
+        result = Application.install(:file, session[:tempfile].path)
+      else
+        raise "unknown install source type: #{session[:source_type]}"
+      end
+    rescue GemManager::InstallFailed => e
+      result = e.message
+    ensure
+      session.clear
+      h result
     end
-
-    session.clear
-    h result
   end
 
   def uninstall(id)
@@ -64,12 +58,11 @@ class Applications < Controller
 
   def _uninstall(id)
     if app = Application.get(id)
-      result = GemManager.uninstall(app.name, app.version)
-      app.destroy
-      result
+      result = app.uninstall
     else
-      ""
+      result = ""
     end
+    result
   end
 
   def start(id)

data/model/application.rb

@@ -7,6 +7,38 @@ class Application
   property :name, String
   property :version, String
 
+  # Install the speficied gem and create an Application
+  def self.install(by, value)
+    case by
+    when :name
+      result, name, version = GemManager.install_gem(value)
+    when :file
+      result, name, version = GemManager.install_file(value)
+    else
+      raise "invalid parameter: by => #{by}" 
+    end
+
+    unless Application.first(:name => name, :version => version)
+      Application.create({
+        :pid => nil,
+        :port => 30000 + rand(9999),
+        :name => name,
+        :version => version,
+      })
+    end
+
+    return result
+  end
+
+  # Uninstall the gem and destroy myself
+  def uninstall
+    result = GemManager.uninstall(self.name, self.version)
+    self.destroy
+
+    return result
+  end
+
+  # Start the app in background
   def start
     return if self.pid
 
@@ -26,6 +58,7 @@ class Application
     self.save
   end
 
+  # Kill the app if running
   def stop
     if self.pid
       Servant.kill(self.pid)
@@ -33,6 +66,7 @@ class Application
     end
   end
 
+  # Returns a string contains name and version
   def full_name
     "#{self.name}-#{self.version}"
   end
@@ -59,4 +93,4 @@ class Application
 end
 DataMapper.auto_upgrade!
 
-Application.all.each{|a| a.update_attributes(:pid => nil)}
+Application.all.each{|a| a.update(:pid => nil)}

data/model/init.rb

@@ -2,4 +2,4 @@ require 'dm-core'
 Ramaze::Log.info("opening database: #{Conf.db_path}")
 DataMapper.setup(:default, "sqlite3://#{Conf.db_path}")
 
-require 'model/application'
+require __DIR__("application.rb")

data/ruby-station.gemspec

@@ -5,21 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-station}
-  s.version = "0.1.3"
+  s.version = "0.1.4.rc1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-10-03}
+  s.date = %q{2009-10-18}
   s.default_executable = %q{ruby-station}
   s.description = %q{Create, Distribute, and Install Ruby applications easily}
   s.email = %q{yutaka.hara/at/gmail.com}
   s.executables = ["ruby-station"]
-  s.extra_rdoc_files = [
-    "ChangeLog"
-  ]
   s.files = [
     ".gitignore",
-     "ChangeLog",
+     "History.txt",
      "Rakefile",
      "VERSION",
      "bin/ruby-station",
@@ -40,22 +37,30 @@ Gem::Specification.new do |s|
      "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",
@@ -77,23 +82,32 @@ Gem::Specification.new do |s|
     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.10.1"])
-      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.3.101"])
+      s.add_runtime_dependency(%q<ramaze>, ["= 2009.07"])
+      s.add_runtime_dependency(%q<dm-core>, ["= 0.10.1"])
+      s.add_runtime_dependency(%q<do_sqlite3>, ["= 0.10.0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.4.2"])
+      s.add_development_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_development_dependency(%q<webrat>, ["= 0.5.3"])
+      s.add_development_dependency(%q<culerity>, ["= 0.2.3"])
     else
-      s.add_dependency(%q<ramaze>, [">= 2009.07"])
-      s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_dependency(%q<cucumber>, [">= 0.3.101"])
+      s.add_dependency(%q<ramaze>, ["= 2009.07"])
+      s.add_dependency(%q<dm-core>, ["= 0.10.1"])
+      s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
+      s.add_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_dependency(%q<cucumber>, ["= 0.4.2"])
+      s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_dependency(%q<webrat>, ["= 0.5.3"])
+      s.add_dependency(%q<culerity>, ["= 0.2.3"])
     end
   else
-    s.add_dependency(%q<ramaze>, [">= 2009.07"])
-    s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.8"])
-    s.add_dependency(%q<cucumber>, [">= 0.3.101"])
+    s.add_dependency(%q<ramaze>, ["= 2009.07"])
+    s.add_dependency(%q<dm-core>, ["= 0.10.1"])
+    s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
+    s.add_dependency(%q<rspec>, ["= 1.2.9"])
+    s.add_dependency(%q<cucumber>, ["= 0.4.2"])
+    s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+    s.add_dependency(%q<webrat>, ["= 0.5.3"])
+    s.add_dependency(%q<culerity>, ["= 0.2.3"])
   end
 end

data/runtime/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/runtime/lib/ruby-station.rb

@@ -25,6 +25,4 @@ module RubyStation
   def self.data_path(filename)
     File.expand_path(filename, @data_dir)
   end
-
-  autoload :Helper, "ruby-station/helper"
 end

data/runtime/ruby-station-runtime.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-station-runtime}
+  s.version = "0.0.5"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Yutaka HARA"]
+  s.date = %q{2009-10-08}
+  s.email = %q{yutaka.hara/at/gmail.com}
+  s.files = ["Rakefile", "lib/ruby-station", "lib/ruby-station/helper", "lib/ruby-station.rb"]
+  s.has_rdoc = false
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Runtime library for RubyStation}
+
+  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
+    else
+    end
+  else
+  end
+end

data/sample.config.yaml

@@ -2,6 +2,8 @@
 :gem_command: "gem"
 :gem_dir: "./gem_home"
 :gem_bin_dir: "./gem_bin"
-:gem_install_option: "--no-rdoc --no-ri --verbose"
 :data_dir: "./data"
+:db_path: "./ruby-station.db"
+:gem_install_option: "--no-rdoc --no-ri"
 :server_port: 2534
+:debug: false

data/tests/README

@@ -1,28 +1,31 @@
-Unit tests for RubyStation
-==========================
+How to run tests of RubyStation
+===============================
 
-spec
+Spec
 ----
 
+1. install rspec
     $ gem intall rspec
 
-rspec spec/*
+2. run test
 
+    $ rake spec
 
-features
+Features
 --------
 
 1. install cucumber:
     $ gem install cucumber
 
-2. install jruby:
-    TODO
+2. install jruby (http://jruby.org/)
 
 JRuby must be executable by 'jruby'.
 
 3. install culerity:
     $ gem install langalex-culerity --source http://gems.github.com
 
+4. run test
+    $ rake cucumber
 
 
 

data/tests/Rakefile

@@ -5,7 +5,18 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = %w{--format pretty}
 end
 
+desc "run cucumber with cucumber-1.9"
+task "cucumber-1.9" do
+  cd "features/"
+  sh "cucumber-1.9 *.feature"
+end
+
 desc "run rspec"
 task "spec" do
   sh "spec spec/*.rb"
 end
+
+desc "run rspec with spec-1.9"
+task "spec-1.9" do
+  sh "spec-1.9 spec/*.rb"
+end

data/tests/console.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'irb'
+require "ramaze"
+
+Conf = Object.new
+def Conf.db_path
+  __DIR__("./tmp/ruby-station.db")
+end
+
+require __DIR__("../model/init.rb")
+IRB.start

data/tests/data/conf_dir/config.yaml

@@ -2,6 +2,8 @@
 :gem_command: "gem"
 :gem_dir: "../../tmp/gem_home"
 :gem_bin_dir: "../../tmp/gem_bin"
-:gem_install_option: "--no-rdoc --no-ri --verbose"
+:db_path: "../../tmp/ruby-station.db"
 :data_dir: "../../tmp/data"
-:server_port: 25341
+:gem_install_option: "--no-rdoc --no-ri --verbose"
+:server_port: 7001
+:debug: true

data/tests/data/hello/hello-ruby-station.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{hello-ruby-station}
+  s.version = "0.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Yutaka HARA"]
+  s.date = %q{2009-10-02}
+  s.description = %q{Greets you}
+  s.email = %q{yutaka.hara/at/gmail.com}
+  s.files = [
+     "hello-ruby-station.gemspec",
+     "main.rb"
+  ]
+  s.homepage = %q{}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Greets you}
+
+  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<sinatra>, [">= 0"])
+    else
+      s.add_dependency(%q<sinatra>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, [">= 0"])
+  end
+end

data/tests/data/hello/main.rb

@@ -0,0 +1,15 @@
+require 'optparse'
+require 'rubygems'
+require 'ruby-station'; RubyStation.parse_argv
+require 'sinatra'
+
+File.open("#{RubyStation.data_dir}/hello.txt", "w"){|f|
+  f.print "hello"
+}
+
+get '/' do
+  'Hello, world!'
+end
+
+set :port, RubyStation.port
+

data/tests/development/config.yaml

@@ -0,0 +1,9 @@
+:ruby_command: "ruby"
+:gem_command: "gem"
+:gem_dir: "./gem_home"
+:gem_bin_dir: "./gem_bin"
+:db_path: "./ruby-station.db"
+:data_dir: "./data"
+:gem_install_option: "--no-rdoc --no-ri --verbose"
+:server_port: 25341
+:debug: true

data/tests/features/install_file.feature

@@ -4,11 +4,11 @@ Feature: Install by file
   I want to install a new gem file
 
   Scenario: Install a gem by file
-    Given I do not have 'hello 0.2.0'
+    Given I do not have 'hello-ruby-station 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'
+    And I fill in the path of 'data/hello/pkg/hello-ruby-station-0.3.2.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'
+    And I should have 'hello-ruby-station 0.3.2'

data/tests/features/list.feature

@@ -1,11 +1,10 @@
-Feature: List
+Feature: Listing
   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'
+    Given I have 'hello-ruby-station 0.3.1'
+    When I visit the index page
+    Then I should see 'hello-ruby-station'
+    And I should see '0.3.1'

data/tests/features/reinstall.feature

@@ -0,0 +1,10 @@
+Feature: Re-Install
+  In order to be sure the app is installed
+  As an application user
+  I want to install the app again
+
+  Scenario: Reinstalling a gem
+    Given I have 'hello-ruby-station 0.3.1' and its data
+    When I install 'hello-ruby-station 0.3.1'
+    Then I should still have 'hello-ruby-station 0.3.1'
+    And data files of 'hello-ruby-station 0.3.1' should exist