my 0.3.0 → 0.3.1

data/Manifest

@@ -8,10 +8,9 @@ features/aliases.feature
 features/files.feature
 features/folder.feature
 features/questions.feature
-features/sinatra.feature
 features/support/env.rb
 features/support/hooks.rb
-features/support/interactive_steps.rb
+features/support/aruba_interactive.rb
 features/support/steps.rb
 features/usage.feature
 lib/my.rb

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/features/advanced.feature

@@ -4,6 +4,7 @@ As a My script writer
 I want to nest tasks inside of questions
 So I can respond dynamically to the user's needs
 
+@aruba_interactive
 Scenario: Nesting questions
 Given a file named "yes.template" with:
   """
@@ -24,6 +25,5 @@ And a file named "script.rb" with:
 When I run "../../bin/my script.rb" interactively
 And I type "y"
 And I type "y"
-And the program completes
 Then the file "foo.txt" should contain "The user picked yes"
 Then the file "bar.txt" should contain "The user picked yes"

data/features/questions.feature

@@ -4,6 +4,7 @@ As a user of the My gem
 I want to optionally run tasks
 So that I can be explicit
 
+@aruba_interactive
 Scenario: Accepting a prompt
 Given a file named "yes.txt.template" with:
   """
@@ -20,9 +21,9 @@ When I run "../../bin/my script.rb" interactively
 Then the program should prompt "Would you like to add a file? [y/N]"
 
 When I type "y"
-And the program completes
 Then the file "yes.txt" should contain "The user picked yes"
 
+@aruba_interactive
 Scenario: Declining a prompt
 Given a file named "no.txt.template" with:
   """
@@ -39,5 +40,4 @@ When I run "../../bin/my script.rb" interactively
 Then the program should prompt "Would you like to add a file? [y/N]"
 
 When I type "n"
-And the program completes
 Then the file "no.txt" should contain "The user picked no"

data/features/support/aruba_interactive.rb

@@ -0,0 +1,42 @@
+require 'open3'
+
+Before '@aruba_interactive' do
+  @stdout_stream        = nil
+  @stderr_stream        = nil
+  @stdout               = ""
+  @stdin                = ""
+
+  @stdout_listener = Thread.new do
+    Thread.stop
+    loop do
+        @stdout << @stdout_stream.readpartial(1)
+    end
+  end
+
+  @stderr_listener = Thread.new do
+    Thread.stop
+    loop do
+      @stderr << @stderr_stream.readpartial(1)
+    end
+  end
+end
+
+When /^I run "([^\"]*)" interactively$/ do |arg1|
+  old_dir = Dir.pwd
+  Dir.chdir("tmp/aruba") unless Dir.pwd.split('/')[-1] == "aruba"
+  @stdin_stream, @stdout_stream, @stderr_stream = Open3.popen3(arg1)
+  Dir.chdir(old_dir)
+  sleep 1
+  @stdout_listener.run
+  @stderr_listener.run
+end
+
+When /^I type "([^\"]*)"$/ do |arg1|
+  @stdin_stream.puts arg1
+  sleep 0.5
+end
+
+Then /^the program should prompt "([^\"]*)"$/ do |arg1|
+  sleep 0.5
+  @stdout.should include(arg1)
+end

data/features/support/steps.rb

@@ -1,6 +1,3 @@
-Then /^I debug$/ do
-end
-
 Given /^there are no scripts installed$/ do
   File.open(My::Config.scripts,"w"){|f|f.write({}.to_yaml)}
 end
@@ -20,3 +17,7 @@ Then /^the following folders should (not )?exist:$/ do |negation,table|
     File.exist?(folder).should == !negation
   end
 end
+
+When /^I wait (\d+) seconds?$/ do |arg1|
+  sleep arg1.to_f
+end

data/lib/my/config.rb

@@ -23,7 +23,7 @@ module My
     #
     #   My::Config.environment = 'test'
     #   My::Config.scripts
-    #     # => "/home/gisikw/.rvm/gems/ruby-1.8.7-p249/gems/my-0.3.0/test.yml"
+    #     # => "/home/gisikw/.rvm/gems/ruby-1.8.7-p249/gems/my-0.3.1/test.yml"
     def scripts
       case self.environment||='production'
         when /^production$/

data/lib/my/runner.rb

@@ -48,7 +48,7 @@ module My
     #
     # <em>produces (for example):</em>
     #
-    #   My v.0.3.0
+    #   My v.0.3.1
     #   USAGE: my [NAME|URL]
     #   
     #   Additional commands:

data/my.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{my}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin W. Gisi"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-06-08}
   s.default_executable = %q{my}
   s.description = %q{Ruby template and configuration manager}
   s.email = %q{kevin@kevingisi.com}
   s.executables = ["my"]
   s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/my", "lib/my.rb", "lib/my/config.rb", "lib/my/runner.rb", "lib/my/script.rb"]
-  s.files = ["LICENSE", "README.rdoc", "Rakefile", "VERSION", "bin/my", "features/advanced.feature", "features/aliases.feature", "features/files.feature", "features/folder.feature", "features/questions.feature", "features/sinatra.feature", "features/support/env.rb", "features/support/hooks.rb", "features/support/interactive_steps.rb", "features/support/steps.rb", "features/usage.feature", "lib/my.rb", "lib/my/config.rb", "lib/my/runner.rb", "lib/my/script.rb", "spec/config_spec.rb", "spec/runner_spec.rb", "spec/script_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "Manifest", "my.gemspec"]
+  s.files = ["LICENSE", "README.rdoc", "Rakefile", "VERSION", "bin/my", "features/advanced.feature", "features/aliases.feature", "features/files.feature", "features/folder.feature", "features/questions.feature", "features/support/env.rb", "features/support/hooks.rb", "features/support/aruba_interactive.rb", "features/support/steps.rb", "features/usage.feature", "lib/my.rb", "lib/my/config.rb", "lib/my/runner.rb", "lib/my/script.rb", "spec/config_spec.rb", "spec/runner_spec.rb", "spec/script_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "Manifest", "my.gemspec"]
   s.homepage = %q{http://gisikw.github.com/my}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "My", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Kevin W. Gisi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: my
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,10 +84,9 @@ files:
 - features/files.feature
 - features/folder.feature
 - features/questions.feature
-- features/sinatra.feature
 - features/support/env.rb
 - features/support/hooks.rb
-- features/support/interactive_steps.rb
+- features/support/aruba_interactive.rb
 - features/support/steps.rb
 - features/usage.feature
 - lib/my.rb

data/features/sinatra.feature

@@ -1,72 +0,0 @@
-Feature: Ensuring README examples
-
-As a My project maintainer
-I want to ensure my Sinatra example works
-So I that I avoid humiliation
-
-Background:
-  Given a file named "script.rb" with:
-  """
-  # Sinatra My Script
-
-  file "app.rb"     => "http://pastie.org/944315.txt"
-  file "config.ru"  => "http://pastie.org/994640.txt"
-
-  ask "Will you be using external views?"
-  yes do
-    folder  "views"
-    file    "views/index.html" => "http://pastie.org/944311.txt"
-  end
-
-  ask "Will you be using an external stylesheet?"
-  yes do
-    folder  "views"
-    file    "views/style.sass" => "http://pastie.org/944313.txt"
-  end
-  """
-
-Scenario: Answering yes and yes
-  When I run "../../bin/my script.rb" interactively
-  And I type "y"
-  And I type "y"
-  And the program completes
-  Then the following files should exist:
-    | app.rb           |
-    | config.ru        |
-    | views/index.html |
-    | views/style.sass |
-
-Scenario: Answering yes and no
-  When I run "../../bin/my script.rb" interactively
-  And I type "y"
-  And I type "n"
-  And the program completes
-  Then the following files should exist:
-    | app.rb           |
-    | config.ru        |
-    | views/index.html |
-  And the following files should not exist:
-    | views/style.sass |
-
-Scenario: Answering no and yes
-  When I run "../../bin/my script.rb" interactively
-  And I type "n"
-  And I type "y"
-  And the program completes
-  Then the following files should exist:
-    | app.rb           |
-    | config.ru        |
-    | views/style.sass |
-  And the following files should not exist:
-    | views/index.html |
-
-Scenario: Answering no and no
-  When I run "../../bin/my script.rb" interactively
-  And I type "n"
-  And I type "n"
-  And the program completes
-  Then the following files should exist:
-    | app.rb           |
-    | config.ru        |
-  And the following folders should not exist:
-    | views            |

data/features/support/interactive_steps.rb

@@ -1,41 +0,0 @@
-require 'open3'
-
-@interactive_history = []
-
-def run_interactive_program
-  old_dir = Dir.pwd
-  Dir.chdir("tmp/aruba") unless Dir.pwd.split('/')[-1] == "aruba"
-  @stdin, @stdout, @stderr = Open3.popen3(@interactive_prog)
-  @interactive_history.each do |input|
-    @stdin.puts input
-  end
-  @output = ""
-  begin
-    loop do
-      Timeout::timeout(1) do
-        @output << @stdout.readpartial(1)
-      end
-    end
-  rescue Timeout::Error
-  rescue EOFError
-  end
-  Dir.chdir(old_dir)
-end
-
-When /^I run "([^\"]*)" interactively$/ do |arg1|
-  @interactive_prog = arg1
-  @interactive_history = []
-end
-
-Then /^the program should prompt "([^\"]*)"$/ do |arg1|
-  run_interactive_program
-  @output.should include(arg1)
-end
-
-When /^I type "([^\"]*)"/ do |arg1|
-  @interactive_history << arg1
-end
-
-When /^the program completes$/ do
-  run_interactive_program
-end