clintegracon 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a353f14c43f8264fb73734b7a233f0b35c08856b
-  data.tar.gz: 6815b80d19d019e4d8ce6e882d6c348b715d9958
+SHA256:
+  metadata.gz: c109a85017b07bd104daa1df36db468a32c8aa8c3100fbb333cf8f9f3c8db6cc
+  data.tar.gz: 7db0ebd75c0065fc879602ebc290b5a9fb12133b4af83f6052298941f34c4249
 SHA512:
-  metadata.gz: 817077bf1e86ecc36915b5bb04ca95300cde6a0c6d84618a8998abf6dcb7b877df532f0db2c99901582e9b6f609eb0a413d4b8fd8abfd34b5063f0a6da98e74f
-  data.tar.gz: f75f9fe2a055d8bdc3e7d1a818f1eae681ee6a362d3c65b22e5968aa6323ea296f8a8b05cf28ab8dd8bb63aa60bc4b8690ccea0fbf1b22ec7a8429daab533671
+  metadata.gz: 1781e7d5690b30f839e8a15d261db1da46589b1b4b383f0fe24f8d256ec65db0c30b600348a243cc37b169605154a5640aed9473cb050470ecb39590ce1ba05a
+  data.tar.gz: 58c3fcc06f756d7d1eddc64320072a468b8852328a077981aed3b7f261e21040ceb8db7cae48299dcc6f01a8204a3b385c7a08128aa6b0919adec088b1520c64

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
+  - 2.5.0
   # OS X 10.9.5-10.10.0 (2.0.0-p481)
   - 2.0.0-p481
-  # OS X 10.9.3-10.9.4
-  - 2.0.0-p451
-
 
 #addons:
 # code_climate:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    clintegracon (0.8.1)
-      colored (~> 1.2)
+    clintegracon (0.9.0)
+      colored2 (~> 3.1)
       diffy
 
 GEM
@@ -17,15 +17,15 @@ GEM
     bacon (1.2.0)
     claide (0.8.1)
     coderay (1.1.0)
-    colored (1.2)
-    diffy (3.0.7)
+    colored2 (3.1.2)
+    diffy (3.2.1)
     i18n (0.7.0)
     inch (0.6.1)
       pry
       sparkr (>= 0.2.0)
       term-ansicolor
       yard (~> 0.8.7.5)
-    json (1.8.2)
+    json (1.8.6)
     metaclass (0.0.4)
     method_source (0.8.2)
     minitest (5.6.1)
@@ -33,6 +33,8 @@ GEM
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -59,7 +61,8 @@ DEPENDENCIES
   clintegracon!
   inch
   mocha-on-bacon
+  prettybacon
   rake
 
 BUNDLED WITH
-   1.10.6
+   1.16.6

data/Rakefile

@@ -2,7 +2,7 @@
 
 begin
   require 'bundler/gem_tasks'
-  require 'colored'
+  require 'colored2'
 
   namespace :spec do
 

data/clintegracon.gemspec

@@ -22,14 +22,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'activesupport', '>= 3.1'
   spec.add_development_dependency "bacon"
-  spec.add_development_dependency "mocha-on-bacon"
+  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "claide", "~> 0.8"    # Example CLI
   spec.add_development_dependency "inch"
-  spec.add_development_dependency 'activesupport', '>= 3.1'
+  spec.add_development_dependency "mocha-on-bacon"
+  spec.add_development_dependency "prettybacon"
+  spec.add_development_dependency "rake"
 
-  spec.add_runtime_dependency 'colored', '~> 1.2'
+  spec.add_runtime_dependency 'colored2', '~> 3.1'
   spec.add_runtime_dependency 'diffy'
 end

data/lib/CLIntegracon/adapter/bacon.rb

@@ -1,4 +1,4 @@
-require 'colored'
+require 'colored2'
 
 # Layout structure
 module CLIntegracon
@@ -85,8 +85,7 @@ module CLIntegracon::Adapter::Bacon
     #
     def cli_spec(spec_dir, head_args=nil, tail_args=nil, based_on: nil)
       file_spec(spec_dir, based_on: based_on) do
-        output = subject.launch(head_args, tail_args)
-        status = $?
+        output, status = subject.launch(head_args, tail_args)
 
         args = [head_args, tail_args].compact
         it "$ #{subject.name} #{args.join(' ')}" do

data/lib/CLIntegracon/diff.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'colored'
+require 'colored2'
 require 'diffy'
 
 module CLIntegracon

data/lib/CLIntegracon/formatter.rb

@@ -1,4 +1,4 @@
-require 'colored'
+require 'colored2'
 
 module CLIntegracon
 
@@ -151,7 +151,7 @@ module CLIntegracon
           when /^\+/ then line.green
           when /^-/ then  line.red
           else            line
-        end.gsub("\n",'')
+        end.gsub("\n",'').gsub("\r", '\r')
       end
       description << "--- END ".ljust(max_width, '-')
       description << ''

data/lib/CLIntegracon/subject.rb

@@ -1,6 +1,14 @@
 module CLIntegracon
   class Subject
 
+    ReplacementPattern = Struct.new(:pattern, :replacement) do
+      # Applies the replacement pattern to the given output, returning
+      # a new string with the replacement applied
+      def replace(output)
+        output.gsub(pattern, replacement)
+      end
+    end
+
     #-----------------------------------------------------------------------------#
 
     # @!group Attributes
@@ -24,9 +32,8 @@ module CLIntegracon
     #         Those are added behind the arguments given on +launch+.
     attr_accessor :default_args
 
-    # @return [Hash<String|Regexp,String>]
-    #         The replace patterns, whose keys are expected to occur in the output,
-    #         which should be redacted, when the subject will be executed. These are
+    # @return [Array<ReplacementPattern>]
+    #         The replace patterns that are redacted when the subject is executed. These are
     #         e.g. paths were side-effects occur, like manipulation of user configurations
     #         in dot files or caching-specific directories or just dates and times.
     attr_accessor :replace_patterns
@@ -53,7 +60,7 @@ module CLIntegracon
       self.executable = executable || name
       self.environment_vars = {}
       self.default_args = []
-      self.replace_patterns = {}
+      self.replace_patterns = []
       self.output_path = 'execution_output.txt'
     end
 
@@ -72,7 +79,7 @@ module CLIntegracon
     #         The replacement
     #
     def replace_pattern(pattern, replacement)
-      self.replace_patterns[replacement] = pattern
+      self.replace_patterns << ReplacementPattern.new(pattern, replacement)
     end
 
     # Define a path, whose occurrences in the output should be replaced by
@@ -122,9 +129,10 @@ module CLIntegracon
     #
     def launch(head_arguments='', tail_arguments='')
       command = command_line(head_arguments, tail_arguments)
-      output = apply_replacements(run(command))
+      output, status = run(command)
+      output = apply_replacements(output)
       write_output(command, output)
-      output
+      [output, status]
     end
 
     #-----------------------------------------------------------------------------#
@@ -147,11 +155,13 @@ module CLIntegracon
     # @param  [String] command_line
     #         THe command line to execute
     #
-    # @return [String]
-    #         The output, which is emitted while execution.
+    # @return [[String, Process::Status]]
+    #         The output, which is emitted during execution, and the exit status.
     #
     def run(command_line)
-      `#{environment_var_assignments} #{command_line} 2>&1`
+      require 'open3'
+      env = Hash[environment_vars.map { |k, v| [k.to_s, v.to_s] }]
+      Open3.capture2e(env, command_line.to_s)
     end
 
     # Merges the given with the configured arguments and returns the command
@@ -180,10 +190,9 @@ module CLIntegracon
     #         The redacted output.
     #
     def apply_replacements(output)
-      replace_patterns.each do |key, path|
-        output = output.gsub(path, key)
+      replace_patterns.reduce(output) do |output, replacement_pattern|
+        replacement_pattern.replace(output)
       end
-      output
     end
 
     # Saves the output in a file called #output_path, relative to current dir.

data/lib/CLIntegracon/version.rb

@@ -1,3 +1,3 @@
 module CLIntegracon
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/spec/fixtures/bin/coffeemaker.rb

@@ -1,7 +1,7 @@
 #encoding: utf-8
 
 require 'claide'
-require 'colored'
+require 'colored2'
 require 'yaml'
 
 # Don’t worry, this makes no sense, just an example

data/spec/unit/formatter_spec.rb

@@ -63,6 +63,20 @@ $before
 \e[31m- $removed\e[0m
 $after
 --- END ------------
+EOS
+      end
+
+      it 'should show carriage returns' do
+        diff = ['$before', "+ $blah\radd", "- $blah\rremoved", '$after']
+        diff.stubs(:relative_path => '$relative_path')
+        @formatter.describe_file_diff(diff, 20).to_s.should.be.eql? <<-EOS
+File comparison error `$relative_path` for $spec_folder:
+--- DIFF -----------
+$before
+\e[32m+ $blah\\radd\e[0m
+\e[31m- $blah\\rremoved\e[0m
+$after
+--- END ------------
 EOS
       end
     end

data/spec/unit/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'pretty_bacon'
 require 'CLIntegracon'
 require 'mocha-on-bacon'
 require 'active_support/core_ext/string/strip'

data/spec/unit/subject_spec.rb

@@ -16,11 +16,11 @@ describe CLIntegracon::Subject do
         /Users/marius/.im/chat.log
         /tmp/im/chat.log
       eos
-      @subject.expects(:`).returns(output)
+      Open3.expects(:capture2e).returns([output, mock()])
       @subject.stubs(:write_output)
       @subject.replace_user_path '.im/chat.log'
       @subject.replace_path '/tmp', '$TMP'
-      @subject.launch.should.be == <<-eos.strip_heredoc
+      @subject.launch.first.should.be == <<-eos.strip_heredoc
         $HOME/.im/chat.log
         $TMP/im/chat.log
       eos
@@ -32,16 +32,33 @@ describe CLIntegracon::Subject do
         Fri Nov 14 22:46:54 - @olivier > Hi
         Fri Nov 14 22:47:13 - @marius > hey
       eos
-      @subject.expects(:`).returns(output)
+      Open3.expects(:capture2e).returns([output, mock()])
       @subject.stubs(:write_output)
       @subject.replace_pattern /\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2}/, '<#DATE#>'
       @subject.replace_pattern /@\w+/, '<REDACTED>'
-      @subject.launch.should.be == <<-eos.strip_heredoc
+      @subject.launch.first.should.be == <<-eos.strip_heredoc
         <#DATE#> - <REDACTED> > ¡Hola!
         <#DATE#> - <REDACTED> > Hi
         <#DATE#> - <REDACTED> > hey
       eos
     end
+
+    it 'should replace multiple patterns with the same replacement string' do
+      output = <<-eos.strip_heredoc
+        abc
+        cde
+        efg
+      eos
+      Open3.expects(:capture2e).returns([output, mock()])
+      @subject.stubs(:write_output)
+      @subject.replace_pattern /b/, ''
+      @subject.replace_pattern /f/, ''
+      @subject.launch.first.should == <<-eos.strip_heredoc
+        ac
+        cde
+        eg
+      eos
+    end
   end
 
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: clintegracon
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Marius Rackwitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,21 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: mocha-on-bacon
+  name: claide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: claide
+  name: mocha-on-bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: inch
+  name: prettybacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Integration specs for your CLI
@@ -255,4 +269,3 @@ test_files:
 - spec/unit/formatter_spec.rb
 - spec/unit/spec_helper.rb
 - spec/unit/subject_spec.rb
-has_rdoc: