icwot 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23bec7c4b1456f3d7ff8498f33c0ee9dda51db2
-  data.tar.gz: 58e231a3bc652d93b47c27a9914e507758f88140
+  metadata.gz: 9748124ee09d8751db32f73b2f49c64ed8bbf047
+  data.tar.gz: 1b0ed9c7114b9c2c2ce31f8e5109e6bfd8cd5110
 SHA512:
-  metadata.gz: 053c2b0d3dacb57e190d23a856ac2eca9368a6c7505ef3e4e98f52cd2e3ecf2cc24f14615ae8a8474be5346c2ae8d8a14837c164ff3d5a06caf4d267c8254797
-  data.tar.gz: d3cadbfa43dc070434bf20b18a6f2ccb201c13199b637cd415104b421d04e60cdd437fdf86e3286b508e42ca6c9726c1496b061fbba6e2d8aaaa1a5abd02328c
+  metadata.gz: f00d11625ac678564c01ad1485d581e1cb3795bdc9b57db7afb4ad12be65e5a4c578bd0a52cdd432434003f30b61e95cb3514b880812e3881effa57e0be89afb
+  data.tar.gz: 805d0bf9d9df6c6823f3ded793173862ce804d664b92593e706251efeb2f2005ea77e31af2eac456f7afba6cbd04b7ef10409c7d49975b5ec925fe78a7a31921

data/bin/icwot

@@ -19,9 +19,10 @@ if Icwot.is_port_open?('localhost', console.port)
 end
 
 client = Client.new(port: console.port, content_type: console.produces)
+console.host_url = client.uri
 
 begin
-  response = RestClient.post console.url, client.to_s, console.header
+  response = RestClient.put console.url, client.to_s, console.header
 rescue RestClient::Exception => e
   puts "Error #{e.response.code} while contacting the host. The url is: '#{console.url}'"
     exit 0
@@ -32,5 +33,9 @@ end
 
 #TODO handle the case when the response of the host is not correct
 puts "The response server: '#{response}' with code #{response.code}"
-
-Icwot.run(console.port, console.log_path)
+begin
+  app = Icwot.run(console.port, console.log_path)
+rescue Interrupt => e
+  RestClient.delete console.url
+  app.quit!
+end

data/lib/icwot.rb

@@ -9,6 +9,7 @@ module Icwot
     app.settings.port = port
     app.settings.log_path = log_path
     app.settings.run!
+    app
   end
 
   # determine if a port is used or not

data/lib/icwot/client.rb

@@ -7,7 +7,7 @@ class Client
   def initialize(options = {})
     @content_type = options[:content_type] || 'application/json'
     @uri = options[:uri]
-    @port = options[:port]
+    @port = options[:port] || '4567'
   end
 
   def uri

data/lib/icwot/console.rb

@@ -1,6 +1,7 @@
 class Console
 
   attr_reader :produces, :accept, :port, :host, :protocol, :log_path, :errors
+  attr_accessor :host_url
 
   def initialize
     @produces = 'application/json'
@@ -53,7 +54,9 @@ class Console
   end
 
   def url
-    protocol+host
+    base_uri = protocol+host
+    base_uri += '/' unless base_uri[-1] == '/'
+    base_uri + host_url
   end
 
   def header

data/lib/icwot/version.rb

@@ -1,5 +1,5 @@
 module Icwot
   def self.version
-    '0.2.1'
+    '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icwot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - leo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake