armstrong 0.2.6 → 0.2.8

data/README.md

@@ -40,7 +40,7 @@ There's a sample `mongrel2.conf` and `config.sqlite` in the `demo` folder, feel
 	require './lib/armstrong'
 	
 	get "/" do
-		output_string "hello world"
+		reply_string "hello world"
 	end
 
 Just like in Sinatra, we state the verb we want to use, the path, and give it a block with the relevant code to execute. So far only 'GET' requests are supported but more will come out in later builds. 

data/armstrong.gemspec

@@ -1,4 +1,4 @@
-Gem::Specification.new 'armstrong', '0.2.6' do |s|
+Gem::Specification.new 'armstrong', '0.2.8' do |s|
   s.description       = "Armstrong is an Mongrel2 fronted, actor-based web development framework similar in style to sinatra. With natively-threaded interpreters (Rubinius2), Armstrong provides true concurrency and high stability, by design."
   s.summary           = "Highly concurrent, sinatra-like framework"
   s.author            = "Artem Titoulenko"

data/bin/armstrong

@@ -13,12 +13,27 @@ def inform
     usage: armstrong <command>
     
     commands:
-      create <name>     Creates an armstrong app with a sample mongrel2.conf and config.sqlite
+      create <name> [port]      Creates an armstrong app with a sample 
+                                mongrel2.conf and config.sqlite running on
+                                [port] or the default 6767.
+                                
+      start [host] [db.sqlite]  Starts a mongrel2 server in this directory
+                                and then runs the app called by the current 
+                                directorys name. This is equivalent to:
+                                  $m2sh start -host localhost -db config.sqlite >> /dev/null &
+                                  $ruby app.rb
+                                  
+      stop [host]               Kills the default running mongrel2 
+                                server or [host]. This is like:
+                                  $m2sh stop -host localhost
+                                  
+    short commands:
+      c = create
+      s = start
+      t = stop
   """
 end
 
-port = 6767
-
 mongrel2_conf = """
 armstrong_handler = Handler(
     send_spec='tcp://127.0.0.1:9999',
@@ -57,8 +72,10 @@ servers = [armstrong_serv]
 inform if ARGV.empty?
 
 case ARGV[0]
+when 'c'
 when 'create'
   inform if ARGV[1].nil?
+  port = (ARGV[2].nil? ? 6767 : ARGV[2])
   mkdir ARGV[1]
   cd ARGV[1]
   %w[log run tmp].map(&method(:mkdir))
@@ -67,4 +84,26 @@ when 'create'
   puts `m2sh load -config mongrel2.conf -db config.sqlite`
   File.open("#{ARGV[1]}.rb", 'w') {|file| file.puts "require 'rubygems'\nrequire 'armstrong'\n\n"}
   puts "Created app #{ARGV[1]} that will run on port #{port}"
+  
+when 's'
+when 'start'
+  host = (ARGV[1].nil? ? 'localhost' : ARGV[1])
+  db = (ARGV[2].nil? ? 'config.sqlite' : ARGV[2])
+  
+  output = `m2sh start -host #{host} -config #{db} > /dev/null &`
+  if output.match /Aborting/
+    puts "Error starting up mongrel2.\n\nTrace:\n#{output}"
+    break
+  end
+  puts "Started #{host} using the #{db} db" 
+  
+  file = Dir.pwd.split('/').last
+  puts "now running #{file}.rb"
+  puts `ruby #{file}.rb`
+  
+when 't'
+when 'stop'
+  host = (ARGV[1].nil? ? 'localhost' : ARGV[1])
+  puts `m2sh stop -host #{host}`
+  puts "Stopped #{host}, I think"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: armstrong
 version: !ruby/object:Gem::Version 
-  hash: 1408122028129865489
+  hash: 2499712927119017196
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Artem Titoulenko