cancun 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f202d6de79548ad6a24fa224f63c1a59950c2424
-  data.tar.gz: 8a776194a29eb70e0a52beac890ea53f4bef443f
+  metadata.gz: e6bee36fb1dea4254f77d5b2d55c45a027dee038
+  data.tar.gz: bc1abfc09c2576d0f3a14c93071b049922148903
 SHA512:
-  metadata.gz: f816371cc3fe946d1f6d41af925910cfe9894c2ca99bad470439d2223eebc528b608b82aa327e3f7d224b74eac4ead7d375e76015a985ac6736fe0ee15ecfc47
-  data.tar.gz: 6ac5fe40a256ba2d0f3e950d0d7311ed8c5af2198941126c59fae70c8cf2f613698a350cf47db153c46ae0460d4223f6b382470a9e791a763634b1eeb20a5cf7
+  metadata.gz: eca8db2c4367a4a5c1566d962beb4c3933f78a95f3a460043b68f74475d9ea47b112af7065520a5ba1273f39da92cf7c7d26687ec86424cfec5df80602bf47f9
+  data.tar.gz: ca8a3701aba1af16b053d724b421df95f5df26fbc2969ee4c5a50d7d2bd2cd19e4a88c8f7131ef5627006f1069c5b2c30207495a8233845f7898d61f894339f7

data/.rspec

@@ -0,0 +1,4 @@
+--colour
+--drb
+--tag ~driver:selenium_chrome
+--profile

data/README.md

@@ -48,42 +48,12 @@ describe Foo do
  
   describe '#hello' do
     it 'says hello correctly' do
-      run described_class.new.salute do
-        type 'bonzo'
-        output.should be('Hi bonzo')
-      end
-    end
+    execute do
+      Foo.new.salute
+    end.and_type 'bonzo'
   end
 ```
 
-###testing executable with Rspec:
-
-For testing this ./executable:
-
-```bash
-#!/usr/bin/env ruby
-
-puts 'who are you?'
-name = gets
-puts "Hi #{name}"
-```
-
-You would use this code:
-
-```ruby
-require 'spec_helper'
-
-describe 'executable' do
-  include Cancun::Executable
-  
-  it 'test executable' do
-    run './executable' do
-      type 'bonzo'
-      output.should be('Hi bonzo')
-    end
-  end
-end
-```
 
 ## Contributing
 

data/cancun.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "sourcify"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'highline'

data/lib/cancun/executable.rb

@@ -1,5 +1,5 @@
 require 'open3'
-module Cancun
+class Cancun
   module Executable
     def init_cancun
       @output_read, @output_write = IO.pipe
@@ -7,9 +7,7 @@ module Cancun
     end
 
     def run(executable)
-      @w = nil
-
-      IO.popen(executable, out: @output_write, in: @input_read)
+      IO.popen(executable, out: @output_read, in: @input_write)
     end
 
     def type(*args)
@@ -17,12 +15,6 @@ module Cancun
       sleep 0.01
     end
 
-    # def type(*stream)
-
-      # @w.puts stream
-      # @w.flush
-    # end
-
     def output
       @output ||= ''
       @output << @output_read.dup.read_nonblock(4096) rescue Errno::EAGAIN

data/lib/cancun/highline.rb

@@ -1,60 +1,63 @@
-module Cancun
-  module Highline
-    attr_reader :exit_code
+require 'timeout'
+require 'sourcify'
 
-    class << self
-      def no_timeout!
-        @no_timeout = true
-      end
+class Cancun
+  module Highline
+    attr_reader :exit_code, :output_read
+    attr_accessor :input_write
 
-      def timeout?
-        !@no_timeout
-      end
-    end
-    def  init_cancun_highline
+    def init_cancun_highline
       @input_read, @input_write = IO.pipe
       @output_read, @output_write = IO.pipe
-      @exit_code = nil
+      @high_line = HighLine.new(@input_read, @output_write)
+      allow(HighLine).to receive(:new).and_return(@high_line)
+    end
 
-      high_line = HighLine.new(@input_read, @output_write)
-      # HighLine.track_eof = false
-      HighLine.stub(:new).and_return(high_line)
+    def execute(&cmd)
+      TestCase.new(self).execute(&cmd)
     end
 
-    def type(*args)
-      @input_write << [*args].flatten.join("\n") + "\n"
-      sleep 0.01
+    def output
+      TestCase.new(self).output
     end
 
-    def run
-      Thread.new do
-        Thread.abort_on_exception = true
-        begin
 
-        if Cancun::Highline.timeout?
-          Timeout.timeout(0.3){ @exit_code = yield }
-        else
-        @exit_code = yield
+    class TestCase
+      def initialize(model)
+        @model = model
+      end
 
-        end
-        rescue Timeout::Error
-          warn 'WARNING: cancun timeout, you can set Cancun::Highline.no_timeout!'
-        end
+      def execute(&block)
+        @block = block
+        self
+      end
 
+      def output
+        @output ||= ''
+        @output << @model.output_read.dup.read_nonblock(4096) rescue Errno::EAGAIN
+        @output
       end
-    end
 
-    def run_sync
-      run { yield }.join
-    end
-    def output
-      @output ||= ''
-      @output << @output_read.dup.read_nonblock(4096) rescue Errno::EAGAIN
-      @output
-    end
+      def and_type(*args)
+        run
+        @model.input_write << [*args].flatten.join("\n") + "\n"
+        sleep 0.01
+      end
 
-    def last_line
-      output.split("\n").last
+      def run
+        Thread.new do
+          Thread.abort_on_exception = true
+          begin
+            if Cancun.timeout?
+              Timeout.timeout(0.3){ @exit_code = @block.call }
+            else
+              @exit_code = @block.call
+            end
+          rescue ::Timeout::Error
+            warn 'WARNING: cancun timeout, you can set Cancun::Highline.no_timeout!'
+          end
+        end
+      end
     end
   end
 end

data/lib/cancun/version.rb

@@ -1,3 +1,3 @@
-module Cancun
-  VERSION = "0.0.4"
+class Cancun
+  VERSION = "0.0.5"
 end

data/lib/cancun.rb

@@ -1,6 +1,15 @@
 require "cancun/version"
 
-module Cancun
+class Cancun
+  class << self
+    def no_timeout!
+      @no_timeout = true
+    end
+
+    def timeout?
+      !@no_timeout
+    end
+  end
 end
 
 require 'cancun/executable'

data/spec/dummy/foo.rb

@@ -1,6 +1,7 @@
 require 'highline'
 
 class Foo
+:q
   def salute
     h = HighLine.new
     name = h.ask 'what is your name?'

data/spec/lib/executable_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe 'excutable spec' do
   include Cancun::Executable
 
-  it 'works for highline' do
+  pending 'works for executables' do
     init_cancun
-      type 'Bonzo'
+    type 'Bonzo'
     run './spec/dummy/bin/foo'
       output.should include('Hi Bonzo')
   end

data/spec/lib/highline_spec.rb

@@ -8,9 +8,10 @@ describe 'highline spec' do
   end
 
   it 'works for highline' do
-      type 'bonzo'
-      run_sync {Foo.new.salute}
-      output.should include('Hi Bonzo')
+    execute do
+      Foo.new.salute
+    end.and_type 'bonzo'
+    expect(output).to include('Hi bonzo')
   end
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cancun
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - bonzofenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sourcify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: this gem should provide a simple DSL solution for unit and integration tests