checkcheckit 0.3.1 → 0.4.0

data/checkcheckit.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'lucy-goosey', '~> 0.2.0'
   gem.add_dependency 'excon'
   gem.add_dependency 'yajl-ruby'
-  gem.add_dependency 'socketio-client'
 end

data/lib/checkcheckit.rb

@@ -1,7 +1,6 @@
 require 'lucy-goosey'
 require 'excon'
 require 'yajl/json_gem'
-require 'socketio'
 
 require "checkcheckit/version"
 

data/lib/checkcheckit/console.rb

@@ -10,7 +10,6 @@ class CheckCheckIt::Console
   def initialize(opts = {})
     @out_stream = opts[:out_stream] || $stdout
     @in_stream  = opts[:in_stream]  || $stdin
-    @web_socket = opts[:web_socket] || SocketIO
   end
 
   def dir
@@ -71,14 +70,7 @@ class CheckCheckIt::Console
 
         return if @options['no-cli'] || @options['web-only']
 
-        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, RuntimeError => e
-          $stderr.puts "Websocket refused connection - using POST"
-          @use_post = true
-        end
+        @live = true
       end
 
       step_through_list(list)
@@ -142,7 +134,7 @@ class CheckCheckIt::Console
         return
       end
 
-      if check
+      if check && @live
         update_server_with_step(i)
       end
 
@@ -193,15 +185,6 @@ class CheckCheckIt::Console
     ENV['CHECKCHECKIT_URL'] || DEFAULT_URL
   end
 
-  def post_check(list_id, step_id)
-    begin
-      url = URI.join(web_service_url, "/#{list_id}/check/#{step_id}").to_s
-      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
@@ -219,11 +202,12 @@ class CheckCheckIt::Console
     end
   end
 
-  def update_server_with_step(i)
-    if @client
-      @client.emit 'check', {list_id: @list_id, step_id: i}
-    elsif @use_post
-      post_check(@list_id, i)
+  def update_server_with_step(step_id)
+    begin
+      url = URI.join(web_service_url, "/#{@list_id}/check/#{step_id}").to_s
+      Excon.post(url)
+    rescue Excon::Errors::SocketError, ArgumentError => e
+      puts "Error POSTing to #{url}"
     end
   end
 end

data/lib/checkcheckit/version.rb

@@ -1,3 +1,3 @@
 module CheckCheckIt
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/start_test.rb

@@ -6,13 +6,6 @@ class StartTest < CheckCheckIt::TestCase
     super
     Examples.create_grocery_list(home)
     console.in_stream  = MiniTest::Mock.new
-    console.web_socket = MiniTest::Mock.new
-  end
-
-  def mock_web_socket
-    client = MiniTest::Mock.new
-    console.web_socket.expect :connect, client, [String, {sync: true}]
-    client
   end
 
   def test_list_parses_steps
@@ -33,12 +26,17 @@ class StartTest < CheckCheckIt::TestCase
   #
   # we setup the POST with the list data
   def test_live_flag_triggers_live_mode
-    client = mock_web_socket
-    3.times { client.expect :emit, true, ['check', Hash] }
+    #stub setup
     Excon.stub({:method => :post, :body => {
       emails: nil,
       list:   List.new(home + '/personal/groceries').to_h
-    }.to_json}, {:status => 200})
+    }.to_json}, {:status => 200,:body => '"DEADBEEF"'})
+
+    #stub checks
+    3.times do |i|
+      Excon.stub({:method => :post, :path => "/DEADBEEF/check/#{i}" },
+                 {:status => 200})
+    end
     3.times { console.in_stream.expect :gets, "y" }
     check "start groceries --live"
   end
@@ -50,12 +48,17 @@ class StartTest < CheckCheckIt::TestCase
   # The webservice sends you an email with a link to the list so
   # you can run it on the web.
   def test_email_flag_triggers_live_mode
-    client = mock_web_socket
-    3.times { client.expect :emit, true, ['check', Hash] }
+    # stub setup
     Excon.stub({:method => :post, :body => {
       emails: "csquared@heroku.com,thea.lamkin@gmail.com",
       list:   List.new(home + '/personal/groceries').to_h
-    }.to_json}, {:status => 200})
+    }.to_json}, {:status => 200, :body => '"DEADBEEF"'})
+
+    # stub checks
+    3.times do |i|
+      Excon.stub({:method => :post, :path => "/DEADBEEF/check/#{i}" },
+                 {:status => 200})
+    end
     3.times { console.in_stream.expect :gets, "y" }
     check "start groceries --email csquared@heroku.com,thea.lamkin@gmail.com"
   end
@@ -63,38 +66,43 @@ class StartTest < CheckCheckIt::TestCase
   # 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 = mock_web_socket
-    3.times { client.expect :emit, true, ['check', Hash] }
+
+    #stub setup
     Excon.stub({:method => :post, :body => {
       emails: "csquared@heroku.com,thea.lamkin@gmail.com",
       list:   List.new(home + '/personal/groceries').to_h
-    }.to_json}, {:status => 200})
+    }.to_json}, {:status => 200, :body => '"FOO"'})
+
+    # stub checks
+    3.times do |i|
+      Excon.stub({:method => :post, :path => "/FOO/check/#{i}" },
+                 {:status => 200})
+    end
+
     3.times { console.in_stream.expect :gets, "y" }
     check "start groceries"
   end
 
   def test_live_only_sends_on_success
-    client = mock_web_socket
-    1.times { client.expect :emit, true, ['check', Hash] }
-    Excon.stub({:method => :post}, {:status => 200})
+    #stub setup
+    Excon.stub({:method => :post, :body => {
+      emails: nil,
+      list:   List.new(home + '/personal/groceries').to_h
+    }.to_json}, {:status => 200, :body => '"FOO"'})
+
+    # stub checks
+    Excon.stub({:method => :post, :path => "/FOO/check/2" },
+               {:status => 200})
+
     2.times { console.in_stream.expect :gets, "n" }
     1.times { console.in_stream.expect :gets, "y" }
     check "start groceries --live"
   end
 
-  def test_live_falls_back_to_post
-    # stub it the old way
-    ws = console.web_socket
-    def ws.connect(*args); raise WebSocket::Error; end
-    4.times { Excon.stub({:method => :post}, {:status => 200}) }
-    3.times { console.in_stream.expect :gets, "y" }
-    assert_output(//,/POST/) do
-      check "start groceries --live"
-    end
-  end
-
+=begin
   def test_reads_url_from_env
     #skip "too lazy to implement"
   end
+=end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkcheckit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucy-goosey
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: socketio-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Checklists like a boss
 email:
 - christopher.continanza@gmail.com
@@ -117,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3147570249937767500
+      hash: 3500965305452217251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3147570249937767500
+      hash: 3500965305452217251
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23