checkcheckit 0.0.6 → 0.1.0

data/lib/checkcheckit/console.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'uri'
 
 class CheckCheckIt::Console
   attr_accessor :list_dir
@@ -41,26 +42,21 @@ class CheckCheckIt::Console
     list_name = Dir[dir + '/*/*'].find{ |fname| fname.include? target }
     if list_name
       list = List.new(list_name)
-      web_service_url = ENV['CHECKCHECKIT_URL']
-      client = nil
       if (emails = @options['email']) || @options['live']
-
         @list_id = list_id = notify_server_of_start(emails, list)
+        puts "Live at URL: #{URI.join(web_service_url, list_id)}"
 
-        puts "Live at URL: #{web_service_url}/#{list_id}"
-
-        if @options['ws']
-          begin
-            @client = web_socket.connect(web_service_url, sync: true) do
-              after_start { emit('register', {list_id: list_id}) }
-            end
-          rescue Errno::ECONNREFUSED => e
-            STDERR.puts "Websocket refused connection"
+        begin
+          @client = web_socket.connect(web_service_url, sync: true) do
+            after_start { emit('register', {list_id: list_id}) }
           end
+        rescue Errno::ECONNREFUSED, WebSocket::Error => e
+          STDERR.puts "Websocket refused connection - using POST"
+          @use_post = true
         end
       end
 
-      return if @options['no-cli'] || @options['n']
+      return if @options['no-cli'] || @options['web']
       step_through_list(list)
     else
       puts "Could not find checklist via: #{target}"
@@ -114,6 +110,10 @@ class CheckCheckIt::Console
         }
       end
 
+      if @use_post
+        post_check(@list_id, i)
+      end
+
       results[i] = {
         step: i + 1,
         name: step.name,
@@ -161,6 +161,16 @@ class CheckCheckIt::Console
     ENV['CHECKCHECKIT_URL']
   end
 
+  def post_check(list_id, step_id)
+    begin
+      url = URI.join(web_service_url, "/#{list_id}/check/#{step_id}").to_s
+      STDERR.puts url
+      Excon.post(url)
+    rescue Excon::Errors::SocketError, ArgumentError => e
+      puts "Error POSTing to #{url}"
+    end
+  end
+
   # Returns id
   def notify_server_of_start(emails, list)
     begin

data/lib/checkcheckit/version.rb

@@ -1,3 +1,3 @@
 module CheckCheckIt
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/test/start_test.rb

@@ -31,6 +31,8 @@ class StartTest < CheckCheckIt::TestCase
   # you can run it on the web.
   def test_email_flag_triggers_live_mode
     client = MiniTest::Mock.new
+    console.web_socket.expect :connect, client, [String, {sync: true}]
+    3.times { client.expect :emit, true, ['check', Hash] }
     Excon.stub({:method => :post, :body => {
       emails: "csquared@heroku.com,thea.lamkin@gmail.com",
       list:   List.new(home + '/personal/groceries').to_h
@@ -39,19 +41,12 @@ class StartTest < CheckCheckIt::TestCase
     check "start groceries --email csquared@heroku.com,thea.lamkin@gmail.com"
   end
 
-  def test_websocket_mode
+  # Same as above but with env set
+  def test_reads_email_from_env
     set_env 'CHECKCHECKIT_EMAIL', "csquared@heroku.com,thea.lamkin@gmail.com"
     client = MiniTest::Mock.new
     console.web_socket.expect :connect, client, [String, {sync: true}]
-    Excon.stub({:method => :post}, {:status => 200})
-    3.times { console.in_stream.expect :gets, "y" }
     3.times { client.expect :emit, true, ['check', Hash] }
-    check "start groceries --ws"
-  end
-
-  # Same as above but with env set
-  def test_reads_email_from_env
-    set_env 'CHECKCHECKIT_EMAIL', "csquared@heroku.com,thea.lamkin@gmail.com"
     Excon.stub({:method => :post, :body => {
       emails: "csquared@heroku.com,thea.lamkin@gmail.com",
       list:   List.new(home + '/personal/groceries').to_h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkcheckit
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3870174722211618529
+      hash: 2251498122202537334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3870174722211618529
+      hash: 2251498122202537334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23