huginn_agent 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4c07e96bdf6326edef6857e3333478cf4518b6
-  data.tar.gz: ab060170632721a5ee8d6b993713101fe73296cd
+  metadata.gz: b916efe568514474c9fd9aba9c80a809cf0fb12a
+  data.tar.gz: 56b4428e2fdd46c42387d169e78ee231288e467b
 SHA512:
-  metadata.gz: b6c2665dedb53a32d894996d4e5e8e4928d1849608d45116d4e7e904bf1aefb6a2844d0d54f7e5b3f1f289c2d65126969b5158974673b642c316ffce0c0627f0
-  data.tar.gz: 5c2c4475640c6503c54faa35e33a93a2530c5d140a09443811a26adf4d7a652e4d154cd69a4c096ce79ccaed5ae954d9370bb929fcbbfc7317fae7f990899c5c
+  metadata.gz: ab3871b1d75cf6b96bf00f7126f19116f95bf058152dc6205736357c9aa7f35ba363b909bd41e7d70d2febbed2eafbdb847be59e0793c93fab3da476870021b8
+  data.tar.gz: ef5d58ea0fa7b36baa7d8afb128a64ac46cff0d03a2960c849a84772d141a07d3f863b6a92c7735f577b0a083b6a3bb5d3f9fa25ef3a017b037f3978306f0457

data/CHANGELOG.md

@@ -8,6 +8,17 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+### Fixed
+
+## [0.6.0] - 2017-04-12
+
+### Changed
+- Run the specs without redirecting STDOUT and STDIN which allows the usage of debuggers like `pry` (@dsander)
+
+### Fixed
+- Agent gem development dependencies are not available when running the specs (@mandrews)
+- Nested spec files are not loaded when running the specs (@mandrews)
+
 ## [0.5.0] - 2017-02-04
 
 ### Added
@@ -60,7 +71,8 @@ All notable changes to this project will be documented in this file.
 - First official and working release
 
 
-[Unreleased]: https://github.com/cantino/huginn_agent/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/cantino/huginn_agent/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/cantino/huginn_agent/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/cantino/huginn_agent/compare/v0.4.3...v0.5.0
 [0.4.3]: https://github.com/cantino/huginn_agent/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/cantino/huginn_agent/compare/v0.4.1...v0.4.2

data/lib/huginn_agent/helper.rb

@@ -2,18 +2,15 @@ require 'open3'
 
 class HuginnAgent
   class Helper
-    def self.open3(command, streaming_output = true)
+    def self.open3(command)
       output = ""
-      print "\n" if streaming_output
 
       status = Open3.popen3(ENV, "#{command} 2>&1") do |stdin, stdout, _stderr, wait_thr|
         stdin.close
 
         until stdout.eof do
           next unless IO.select([stdout])
-          data = stdout.read_nonblock(1024)
-          print data if streaming_output
-          output << data
+          output << stdout.read_nonblock(1024)
         end
         wait_thr.value
       end
@@ -21,5 +18,10 @@ class HuginnAgent
     rescue IOError => e
       return [1, "#{e} #{e.message}"]
     end
+
+    def self.exec(command)
+      print "\n"
+      [system(ENV, command) == true ? 0 : 1, '']
+    end
   end
 end

data/lib/huginn_agent/patches/gemfile_helper.rb

@@ -0,0 +1,22 @@
+
+# This Gemfile modification was generated by the `rake prepare` command
+#
+class GemfileHelper
+  def self.parse_huginn_agent_gems(dependencies)
+    base_path = File.expand_path('../../../', __FILE__)
+    gemspec = Dir["#{base_path}/*.gemspec"].first
+    previous_gems = Hash[dependencies.map { |dep| [dep.name, dep] }]
+    Gem::Specification.load(gemspec).development_dependencies.each do |args|
+      previous_gem = previous_gems[args.name]
+      if previous_gem
+        abort "Gem #{args.to_s} in #{gemspec} conflicts with huginn/Gemfile" unless previous_gem.match?(args.to_spec)
+      else
+        yield args.name, *args.requirements_list
+      end
+    end
+  end
+end
+
+GemfileHelper.parse_huginn_agent_gems(dependencies) do |args|
+  gem *args
+end

data/lib/huginn_agent/spec_runner.rb

@@ -21,6 +21,14 @@ class HuginnAgent
       end
     end
 
+    def patch
+      Dir.chdir('spec/huginn') do
+        open('Gemfile', 'a') do |f|
+          f.puts File.read(File.join(__dir__, 'patches/gemfile_helper.rb'))
+        end
+      end
+    end
+
     def bundle
       if File.exists?('.env')
         shell_out "cp .env spec/huginn"
@@ -39,7 +47,7 @@ class HuginnAgent
 
     def spec
       Dir.chdir('spec/huginn') do
-        shell_out "bundle exec rspec -r #{File.join(__dir__, 'patches/coverage.rb')} --pattern ../*_spec.rb,../{[!huginn/]}**/*_spec.rb", 'Running specs ...', true
+        shell_out "bundle exec rspec -r #{File.join(__dir__, 'patches/coverage.rb')} --pattern '../**/*_spec.rb' --exclude-pattern './spec/**/*_spec.rb'", 'Running specs ...', true
       end
     end
 
@@ -49,7 +57,11 @@ class HuginnAgent
       (status, output) = Bundler.with_clean_env do
         ENV['ADDITIONAL_GEMS'] = "#{gem_name}(path: ../../)"
         ENV['RAILS_ENV'] = 'test'
-        HuginnAgent::Helper.open3(command, streaming_output)
+        if streaming_output
+          HuginnAgent::Helper.exec(command)
+        else
+          HuginnAgent::Helper.open3(command)
+        end
       end
 
       if status == 0

data/lib/huginn_agent/version.rb

@@ -1,3 +1,3 @@
 class HuginnAgent
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/tasks/spec.rake

@@ -10,6 +10,7 @@ desc "Setup Huginn source, install gems and create the database"
 task :prepare do
   runner.clone
   runner.reset
+  runner.patch
   runner.bundle
   runner.database
 end

data/spec/lib/huginn_agent/helper_spec.rb

@@ -4,28 +4,34 @@ describe HuginnAgent::Helper do
   context '#open3' do
     it "returns the exit status and output of the command" do
       expect(HuginnAgent::Helper).not_to receive(:print)
-      (status, output) = HuginnAgent::Helper.open3("pwd", false)
-      expect(status).to eq(0)
-      expect(output).to eq("#{Dir.pwd}\n")
-    end
-
-    it "prints the output directly when specified" do
-      expect(HuginnAgent::Helper).to receive(:print).twice
-      (status, output) = HuginnAgent::Helper.open3("pwd", true)
+      (status, output) = HuginnAgent::Helper.open3("pwd")
       expect(status).to eq(0)
       expect(output).to eq("#{Dir.pwd}\n")
     end
 
     it "return 1 as the status for failing command" do
-      (status, output) = HuginnAgent::Helper.open3("false", false)
+      (status, output) = HuginnAgent::Helper.open3("false")
       expect(status).to eq(1)
     end
 
     it "returns 1 when an IOError occurred" do
       expect(IO).to receive(:select).and_raise(IOError)
-      (status, output) = HuginnAgent::Helper.open3("pwd", false)
+      (status, output) = HuginnAgent::Helper.open3("pwd")
       expect(status).to eq(1)
       expect(output).to eq('IOError IOError')
     end
   end
+
+  context '#exec' do
+    it "returns the exit status and output of the command" do
+      (status, output) = HuginnAgent::Helper.exec("pwd")
+      expect(status).to eq(0)
+      expect(output).to eq('')
+    end
+
+    it "return 1 as the status for failing command" do
+      (status, output) = HuginnAgent::Helper.exec("false")
+      expect(status).to eq(1)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_agent
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Cantino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,6 +124,7 @@ files:
 - lib/huginn_agent/cli/new.rb
 - lib/huginn_agent/helper.rb
 - lib/huginn_agent/patches/coverage.rb
+- lib/huginn_agent/patches/gemfile_helper.rb
 - lib/huginn_agent/spec_helper.rb
 - lib/huginn_agent/spec_runner.rb
 - lib/huginn_agent/templates/newagent/Gemfile.tt