lis 0.4.3 → 0.4.4

data/bin/lis

@@ -1,8 +1,46 @@
 #!/usr/bin/env ruby
-require 'gli'
-
 require 'lis'
 require 'lis/cli'
 
-exit LIS::CLI.run(ARGV.dup)
+Main {
+  version LIS::VERSION
+  description "LIS interface to Siemens Immulite 2000XPi or other similar analyzers"
+
+  option('verbose', 'v')
+
+  logger.formatter = proc { |severity, datetime, progname, msg|
+    "#{severity}: #{msg}\n"
+  }
+
+  mode "server" do
+    argument('port') {
+      default "/dev/ttyUSB0"
+    }
+
+    argument('http', 'e') do
+      cast :uri
+    end
+
+
+    def run
+      $VERBOSE = true if params[:verbose].given?
+      portname = params[:port].value
+      uri = params[:http].value
+
+      info "configuring port: #{portname} for 9600 baud"
+      `stty -echo raw ospeed 9600 ispeed 9600 < #{portname}`
+
+      port = File.open(portname, "w+")
+
+      warn "listening on: #{portname}"
+      warn "http:         #{uri.to_s}"
+
+      LIS::InterfaceServer.listen(port, uri).run!
+
+
+    end
+  end
+
+}
+
 

data/features/lis_cli.feature

@@ -2,5 +2,5 @@ Feature: My bootstrapped app kinda works
 
   Scenario: App just runs
     When I get help for "lis"
-    Then the exit status should be 0
+    Then the exit status should be 1
 

data/features/step_definitions/lis_cli_steps.rb

@@ -1,6 +1,6 @@
 When /^I get help for "([^"]*)"$/ do |app_name|
   @app_name = app_name
-  step %(I run `#{app_name} --help`)
+  step %(I run `#{app_name} server help`)
 end
 
 # Add more step definitions here

data/lib/lis/cli.rb

@@ -1,47 +1,6 @@
+require 'main'
+
 module LIS
   module CLI
-    extend GLI::App
-    program_desc "LIS interface to Siemens Immulite 2000XPi or other similar analyzers"
-    version LIS::VERSION
-
-    flag ["config","c"], :default_value => File.join(ENV['HOME'],'.lis'),
-                   :desc => "stores configuration and authentication data",
-                   :arg_name => "FILE"
-
-    flag ["listen", "l"], :arg_name => "PORT", :desc => "which port to listen on", :default_value => "/dev/ttyUSB0"
-    flag ["endpoint", "e"], :arg_name => "URI", :desc => "HTTP endpoint", :default_value => "http://localhost/api/lis"
-    switch ["verbose", "v"], :desc => "Increase verbosity"
-
-    pre do |global_options,command,options,args|
-      $VERBOSE = global_options[:verbose]
-      true
-    end
-
-    desc "run the LIS server"
-    command "server" do |c|
-      c.action do |global_options,options,args|
-        port = global_options[:listen]
-        warn "configuring #{port}"
-        `stty -echo raw ospeed 9600 ispeed 9600 < #{port}`
-        warn "listening on: #{port}"
-        port = File.open(port, "w+")
-
-        LIS::InterfaceServer.listen(port, global_options[:endpoint]).run!
-      end
-    end
-
-    desc "load a list of test requests"
-    arg_name "DEVICE_NAME REQUEST_ID"
-    command "requests" do |c|
-      c.action do |global_options,options,args|
-
-        req = LIS::HTTPInterface.new(global_options[:endpoint]).load_requests(*args)
-        puts req.types
-      end
-
-
-    end
-
-
   end
 end

data/lib/lis/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module LIS
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end
 

data/lis.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "packet_io", ">= 0.4.2"
   s.add_dependency "rest-client"
   s.add_dependency "rake"
-  s.add_dependency "gli", ">= 2.0.0.rc5"
+  s.add_dependency "main"
 
   s.add_development_dependency("shoulda", ">= 3.1.0")
   s.add_development_dependency("mocha", ">= 0.12.0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lis
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: main
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4116448878207311103
+      hash: 649274912640500355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: