oria 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/oria

@@ -1,4 +1,64 @@
 #!/usr/bin/env ruby
+require 'optparse'
+# require 'rubygems'
 # require 'oria'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'oria'))
 
-# Oria.run!
+module OriaCommand
+  def self.go
+    case ARGV.shift
+    when 'start'
+      start
+    when 'stop'
+      stop
+    when 'restart'
+      stop
+      start
+    else
+      puts parser #"Usage: oria start|stop|restart"
+    end
+  end
+
+  def self.parser
+    OptionParser.new do |opts|
+      opts.banner = 'Usage: oria <start|stop|restart> [options]'
+      opts.separator ''
+      opts.on('-p', '--port [NUM]', 'The port Oria should listen on.') do |port|
+        @options[:port] = port
+      end
+      opts.on('-h', '--host [IP]', 'The hostname or IP Oria should listen on.') do |host|
+        @options[:host] = port
+      end
+    end
+  end
+
+  def self.parse_options
+    @options = {:host => '0.0.0.0', :port => 6851, :debug => false}
+    parser.parse!
+  end
+
+  def self.start
+    puts "Starting Oria..."
+    parse_options
+    pid = fork do
+      begin
+        Oria::Server.start(@options[:host], @options[:port], nil, @options[:debug])
+      rescue RuntimeError
+        puts "\nOria cannot attach to port #{@options[:port]}. Maybe it's already running?"
+        exit
+      end
+    end
+    Process.detach(pid)
+    sleep 0.5
+    puts "Oria started successfull on proccess ##{pid}"
+  end
+
+  def self.stop
+    puts "Stopping Oria..."
+    puts "Stopped!" if Oria::Server.stop
+  rescue Errno::ESRCH
+    puts "Oria does not appear to be running"
+  end
+end
+
+OriaCommand.go

data/lib/oria/server.rb

@@ -13,7 +13,13 @@ module Oria
       end
 
       def start(server, port, app_key = nil, debug = false)
-        @@pid = Process.pid
+        at_exit do
+          Oria::Server.stop
+        end
+        pid = Process.pid
+        File.open(pid_file, 'w') do |file|
+          file.puts pid
+        end
         app_key ||= 'default'
         @@servers ||= if File.exists?(yaml_store)
           YAML.load_file(yaml_store)
@@ -28,7 +34,12 @@ module Oria
       end
 
       def stop
-        Process.kill('HUP', @@pid) if defined?(@@pid)
+        if File.exists?(pid_file)
+          if pid
+            Process.kill(9, pid)
+          end
+          File.unlink(pid_file)
+        end
       end
 
       def write_hash
@@ -44,6 +55,14 @@ module Oria
         @@log_file ||= File.join(Dir.tmpdir, 'oria.log')
       end
 
+      def pid
+        @@pid ||= File.read(pid_file).to_i if File.exists?(pid_file)
+      end
+
+      def pid_file
+        @@pid_file ||= File.join(Dir.tmpdir, 'oria.pid')
+      end
+
       def yaml_store
         @@yaml_store ||= File.join(Dir.tmpdir, 'oria.yml')
       end

data/oria.gemspec

@@ -0,0 +1,62 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{oria}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Flip Sasser"]
+  s.date = %q{2009-11-22}
+  s.default_executable = %q{oria}
+  s.description = %q{}
+  s.email = %q{flip@x451.com}
+  s.executables = ["oria"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "bin/oria",
+     "lib/oria.rb",
+     "lib/oria/client.rb",
+     "lib/oria/errors.rb",
+     "lib/oria/server.rb",
+     "spec/oria_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/flipsasser/oria}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A Ruby-based, in-memory KVS with one half of the peristence you want}
+  s.test_files = [
+    "spec/oria_spec.rb",
+     "spec/spec_helper.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<eventmachine>, [">= 0.12.10"])
+      s.add_runtime_dependency(%q<json>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+      s.add_dependency(%q<json>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+    s.add_dependency(%q<json>, [">= 2.0.0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oria
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Flip Sasser
@@ -51,6 +51,7 @@ files:
 - lib/oria/client.rb
 - lib/oria/errors.rb
 - lib/oria/server.rb
+- oria.gemspec
 - spec/oria_spec.rb
 - spec/rcov.opts
 - spec/spec.opts