spurious 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25242e746da3686b044a4fd8ccec447ac091d59e
-  data.tar.gz: 3456cf99bf6fc61f4e3f7ebc7124512a2312c34b
+  metadata.gz: 7270ed8a81a8fe9b5984c50cd9937c9e8d0c4e67
+  data.tar.gz: 737f429e662bc5f739a8665c3f758bbe7129ed95
 SHA512:
-  metadata.gz: 870688510a18a3706d4e503f71570c8439c4be57efd85a73dfa6ab3b2cd41321adba2dc80f75cd692b72b9033b707421bebc277a2e44fe8a1475ad117a00991f
-  data.tar.gz: 6f4333f739bbf498a5cf0da27c57037969a1eb548fc36e8d9eef4ca2787de0bff2302b22834afe6d974de90136c67c1990cbfc79aead011fdd0222d95f8694c5
+  metadata.gz: e7b8de0f2bd5a3b8e13161c60659f898c37fccd113ebc5f9b90af7373824a0c9c83f012cb5f035082bf75797206e4f3b5fdd25d07260c868ec50668e5dfbbb6e
+  data.tar.gz: 54de9fee9c573592941ecf1b6b11b0e58fe60a1c8ba247d4c8276142816b4c1b8f53cb922238d6b8665d1e74be042ab538d89b6b16261fdf008fdd03cef29047

data/README.md

@@ -31,8 +31,7 @@ Spurious works on the following platforms:
 
 * OSX
 * Windows
-
-> Support for linux will be available shortly.
+* Linux
 
 ### Dependencies
 
@@ -154,6 +153,20 @@ spurious ports
 that returns the list of host and port details for each of the spurious containers. If you pass the flag --json you'll
 get the result back as a JSON string so you can then parse this and use it to automatically configure your chosen method of working with AWS.
 
+### Debug mode
+
+To enable debug output when running spurious, either use the command line argument:
+
+```bash
+spurious init --debug-mode=true
+```
+
+or set the env variable:
+
+```bash
+SPURIOUS_DEBUG=true spurious init
+```
+
 ### SDK Helpers
 
 Once the containers are running you'll need to wire up the SDK to point to the correct endpoints and port numbers. Here's

data/lib/spurious/app.rb

@@ -12,6 +12,7 @@ module Spurious
 
     class_option :server_port, :type => :string, :default => ENV.fetch('SPURIOUS_SERVER_PORT', 4590), :desc => "The port of spurious server"
     class_option :server_ip, :type => :string, :default => ENV.fetch('SPURIOUS_SERVER_IP', 'localhost'), :desc => "The ip address of spurious server"
+    class_option :debug_mode, :type => :string, :default => ENV.fetch('SPURIOUS_DEBUG', false), :desc => "More verbose output from the spurious server"
     def initialize(*args)
       super
     end

data/lib/spurious/command/ports.rb

@@ -19,6 +19,11 @@ module Spurious
           end
         end
 
+        if data.length == 0
+          app.say "[error] Spurious services haven't been started, please run 'spurious start'", :red
+          close_connection
+        end
+
         if app.options[:json]
           app.say JSON.generate(parsed_data['response'])
         else
@@ -28,7 +33,9 @@ module Spurious
           ) unless parsed_data['response'].empty?
 
         end
-        EventMachine.stop_event_loop if parsed_data['close']
+        if parsed_data['close']
+          close_connection
+        end
 
       end
 

data/lib/spurious/command/state.rb

@@ -14,6 +14,14 @@ module Spurious
         super
         @type = type
         @app = app
+        @exiting = false
+      end
+
+      def unbind
+        unless @exiting
+          app.say "[error] The spurious-server instance has died, start it again with: 'spurious-server start'", :red
+          EventMachine.stop_event_loop
+        end
       end
 
       def post_init
@@ -24,11 +32,28 @@ module Spurious
         data_parts = data.split("\n")
         data_parts.each do |data_part|
           parsed_data = JSON.parse(data_part.strip)
-          app.say parsed_data['response'], parsed_data['type'] == 'error' ? :red : :green
-          EventMachine.stop_event_loop if parsed_data['close']
+          output parsed_data
+          if parsed_data['close']
+            close_connection
+          end
         end
+      end
 
+      def close_connection
+        @exiting = true
+        EventMachine.stop_event_loop
+        exit
       end
+
+      protected
+
+      def output(data)
+        message_type = data['message_type']
+        if message_type != 'debug' || (message_type == 'debug' && app.options['debug_mode'] == 'true')
+          app.say "[#{data['message_type']}] #{data['response']}", data['colour'].to_sym
+        end
+      end
+
     end
   end
 end

data/lib/spurious/version.rb

@@ -1,3 +1,3 @@
 module Spurious
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/spurious.rb

@@ -1,5 +1,3 @@
 require "spurious/version"
 
-module Spurious
-  # Your code goes here...
-end
+module Spurious; end

data/spurious.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "spurious-server"
+  spec.add_runtime_dependency "spurious-server", "~> 0.4.0"
   spec.add_runtime_dependency "eventmachine"
   spec.add_runtime_dependency "timeout"
 end

data/tools/install.sh

@@ -50,11 +50,17 @@ if [[ $(command -v boot2docker) ]]; then
 fi
 
 if [[ $(command -v ruby) ]]; then
-  RUBY_VERSION=$(ruby -v | cut -d' ' -f2 | cut -d'p' -f1)
-  vercomp $RUBY_VERSION "1.9"
-  if [[ $? == 2 ]]; then
-    echo "You must have version 1.9 or greater of ruby installed, currently installed: $(ruby -v)"
+  IS_JRUBY=$(ruby -v | cut -d' ' -f1)
+  if [[ $IS_JRUBY == "jruby" ]]; then
+    echo "Spurious should be run on standard MRI ruby (Specifically the server needs to as it uses fork but you can install the CLI tool under jruby"
     exit 1
+  else
+    RUBY_VERSION=$(ruby -v | cut -d' ' -f2 | cut -d'p' -f1)
+    vercomp $RUBY_VERSION "1.9"
+    if [[ $? == 2 ]]; then
+      echo "You must have version 1.9 or greater of ruby installed, currently installed: $(ruby -v)"
+      exit 1
+    fi
   fi
 fi
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker
@@ -98,16 +98,16 @@ dependencies:
   name: spurious-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement