icwot 0.0.1 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f448dc7e413e657d113e1fcd9cabfc6a41be7e
-  data.tar.gz: 0ebeeb7bf3a5facabc9485810643cccd0d283c21
+  metadata.gz: 44ef186ed365a911a195d9f8ab987530fad72827
+  data.tar.gz: e04f2e3b74c1f06825c296674a90269f4c9c2ef0
 SHA512:
-  metadata.gz: 90594c346e7a20dd281332f7e195372efb9fcd684048d3e031401b904f45dbb37c21fd5951cf68f7a443826b664a0590cd8adf1186ddb2a0cb6cda5a5181dfa0
-  data.tar.gz: 15b78714b94cca8b4135f2234a0d53475c0d11722247b20f592b53ce4e9eda8176ca9daf98d2d3ed53ac602bca4527d0e72ab47b7b9fdd55d062a1edf5c96821
+  metadata.gz: 181b4a37d46af2eaddfa2a3c01c1587cbec499da05fd7ce4891b386fb950993546206f35c6cf366201b006cb44633fa16d652b854ec59790b8bdacd8923cf79b
+  data.tar.gz: 5c333aac859fe46fa61478411f5673abec035828e3a6565b6f09f61a786e2510aa73cf6dd1154e2d5d776734d3983109e31d0652e581534c32b2df94c739a716

data/.gitignore

@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-./idea
+.idea/

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem 'sinatra', :github => 'sinatra/sinatra'
 gem 'thin'
+gem 'rest-client', '~> 1.6.7'
+gem 'json', '~> 1.8.1'

data/README.md

@@ -1,6 +1,6 @@
 # Icwot
 
-TODO: Write a gem description
+RESTfull [sinatra](http://www.sinatrarb.com) server providing inversion of control for logging messages from another RESTfull application web-server
 
 ## Installation
 
@@ -10,7 +10,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -18,7 +18,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+In a terminal run:
+
+    $ icwot
+
+It will start a [sinatra](http://www.sinatrarb.com) server on port 4567. Logging messages will be saved to : your-home-directory/log/icwot-msg.log
 
 ## Contributing
 

data/bin/icwot

@@ -1,4 +1,128 @@
 #!/usr/bin/env ruby
 
 # A simple tool to run server on the client side
-`bundle exec ruby client_server.rb -e production`
+
+require 'socket'
+require 'timeout'
+require 'rest-client'
+require 'json'
+
+# determine if a port is used or not
+# from http://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
+def self.is_port_open?(ip, port)
+  begin
+    Timeout::timeout(1) do
+      begin
+        s = TCPSocket.new(ip, port)
+        s.close
+        return true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      end
+    end
+  rescue Timeout::Error
+  end
+  return false
+end
+
+class Client
+  attr_accessor :uri, :content_type
+
+  def initialize
+    @content_type = 'application/json'
+  end
+
+  def to_xml
+    "<client xmlns=\"http://jaxb.xwot.first.ch.unifr.diuf\"><uri>#{uri}</uri></client>"
+  end
+
+  def to_hash
+    {uri: uri}
+  end
+
+  def get_ip
+    ip=Socket.ip_address_list.detect{|intf| intf.ipv4_private?}
+    ip.ip_address if ip
+  end
+
+  def to_s
+    case content_type
+      when 'application/json'
+        to_hash.to_json
+      when 'application/xml'
+        to_xml
+    end
+  end
+end
+
+if ARGV.empty?
+  puts 'you need to provide at least one argument! See icwot -h'
+  exit 0
+end
+produces = 'application/json'
+accept = 'application/json'
+port = 4567
+host = ''
+protocol = 'http://'
+log_path = ''
+ARGV.each_with_index do |a, index|
+  case a
+    when '-h'
+      puts 'Usage : icwot <host>
+            -h print help
+            -l the host is localhost
+            -c the content-type value for the header application/json by default
+            -a the accept value for the header  text/plain by default
+            -p the port where to run the server
+            -t the protocol to use http:// by default
+            -l where to save the log by default your-home-directory/log/icwot-{port}-msg.log
+            host is where to register for the service.
+            '
+      exit 0
+    when '-l'
+      host='localhost'
+    when '-c'
+      produces = ARGV.delete_at index + 1
+    when '-a'
+      accept = ARGV.delete_at index + 1
+    when '-p'
+      port = ARGV.delete_at(index + 1).to_i
+    when '-t'
+      unless (temp = ARGV.delete_at(index + 1)).nil?
+        protocol = temp
+      end
+    when '-l'
+      log_path = ARGV.delete_at index + 1
+    else
+      host += a
+  end
+end
+
+if host == ''
+  puts 'Host must be set !'
+  exit 0
+end
+
+if port == 0
+  puts 'The port must be bigger than 0'
+  exit 0
+end
+
+if is_port_open?('localhost', port)
+  puts 'Port already in use ! Try another one.'
+  exit 0
+end
+
+client = Client.new
+client.uri = "http://#{client.get_ip.to_s}:#{port}/"
+client.content_type = produces
+
+
+response = RestClient.post protocol+host, client.to_s, accept: accept, content_type: produces
+
+unless response.code == 200
+  puts 'Error. Connection not establish with the server.'
+  exit 0
+end
+
+`sinatra_port=#{port} sinatra_log=#{log_path} bundle exec ruby lib/icwot.rb -e production -p #{port}`

data/icwot.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rake'
 
+  spec.add_dependency 'bundler', '~> 1.3'
   spec.add_dependency 'sinatra', '~> 1.4.4'
   spec.add_dependency 'thin'
+  spec.add_dependency 'rest-client', '~> 1.6.7'
+  spec.add_dependency 'json', '~> 1.8.1'
 end

data/lib/icwot/version.rb

@@ -1,3 +1,3 @@
 module Icwot
-  VERSION = "0.0.1"
+  VERSION = "0.1"
 end

data/lib/icwot.rb

@@ -11,8 +11,9 @@ end
 # POST sur / avec le port 4567
 post '/' do
   content_type 'text/plain'
-  # On enregistre dans un log spécial le body envoyé
+  # On enregistre dans un log spécial le body de la requête
   msg.info request.body.read
+  logger.info "message saved to #{self.class.logger_log_file.path}"
   # On retourne le code http 200 avec le texte 'ok'
   'ok'
 end
@@ -41,10 +42,10 @@ private
 
 # Si le fichier log/msg.log n'existe pas, on le créé, sinon on l'ouvre
 def create_or_open_log
-  file_name = "msg.log"
-  directory_path = "#{settings.root}/log/"
+  file_name = "icwot-#{ENV['sinatra_port']}-msg.log"
+  directory_path = "#{Dir.home}/log/"
   Dir.mkdir(directory_path) unless File.exists?(directory_path)
-  file = File.new(directory_path+file_name, 'a+')
+  file = ((log_path = ENV['sinatra_log']) == '' && !File.exist?(log_path) ? File.new(directory_path+file_name, 'a+') : File.new(ENV['sinatra_log']))
   file.sync = true
   file
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: icwot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - leo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: 'icwot : RESTfull sinatra server providing inversion of control for logging
   messages from another web-server'
 email: