retest 0.8.0.pre → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ae62a28685056281a2e89c483ac3b16f7eaa11c486d764d5404ebcbbeb493a
-  data.tar.gz: 4f9b0a6be227cea4e858e0a36ebafadbc47385629c17fe568e194be99348edfa
+  metadata.gz: 6e058f016e23d459435e738ff0cf3406d65e39b5a504e19abfe3df6dcc695376
+  data.tar.gz: f8c6039063902c21e3b5917dc768b46abdf599c14368984892ba41624565ede0
 SHA512:
-  metadata.gz: be4c01100fdbb277eae592d26bfd1cddce64097a815418d042b746ea1b438f182e744718850fba1ee4cf79a62a6218bdb222d267b4a14f478ddb0dcc5e0f67a1
-  data.tar.gz: 9bd2dd59fead6115cd26df9f1b180b1cc432a568003bfff3469a016ceac7852ee561c5701c48778dfd430229d9e9122128740e0269c17e9bad54a05f213c8622
+  metadata.gz: 67b0d493529e376e1a0f439c618f3e0c8f208ad9ba7ea64c023d15d09fbd641f54106d6ece13be8941a586a924285d23e89940da5e271a559ba17286d33c0214
+  data.tar.gz: d880ee6039b6d0f11a6e420df26cf56358ed74291939717bc4e0db51db8c4b6e829e1bceee58af8490a9b506020c57cc0d4cde6fc7cde889691c61c5787a8956

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  unit-tests:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -36,4 +36,21 @@ jobs:
         bundler-cache: true
     - run: bundle install
     - run: bundle exec rake
-    - run: CUCUMBER_PUBLISH_QUIET=true bundle exec cucumber
+
+  app-tests:
+    name: ${{ matrix.repo }} feature specs
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        repo:
+          - ruby-app
+          - rails-app
+          - hanami-app
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+          bundler-cache: true
+      - run: bin/test/${{ matrix.repo }}

data/Gemfile

@@ -3,8 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in retest.gemspec
 gemspec
 
-gem "cucumber", "~> 5.1"
-gem "aruba", "~> 1.0"
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
 gem "byebug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retest (0.8.0.pre)
+    retest (0.8.2)
       listen (~> 3.2)
       string-similarity (~> 2.1)
       tty-option (~> 0.1)
@@ -9,95 +9,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.3)
-      childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
-      ffi (~> 1.9)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    builder (3.2.4)
     byebug (11.1.3)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.7)
-    contracts (0.16.0)
-    cucumber (5.1.0)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-wire (~> 4.0, >= 4.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.1)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.0.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    diff-lcs (1.4.4)
-    ffi (1.13.1)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
+    ffi (1.14.2)
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    middleware (0.1.0)
     minitest (5.14.1)
-    multi_test (0.1.2)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     rake (12.3.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
     string-similarity (2.1.0)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
     tty-option (0.1.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 1.0)
   byebug
-  cucumber (~> 5.1)
   minitest (~> 5.0)
   rake (~> 12.0)
   retest!

data/README.md

@@ -104,6 +104,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+To run integration tests on one setup (ex: hanami-app): `bin/test/hanami-app`
+
+To access an app container (ex: ruby-app): `docker-compose -f features/ruby-app/docker-compose.yml run retest sh`
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/alexb52/retest.

data/bin/test/hanami-app

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bundle install
+bundle exec rake build
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/hanami-app/retest.gem
+docker-compose -f features/hanami-app/docker-compose.yml up --build

data/bin/test/rails-app

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bundle install
+bundle exec rake build
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rails-app/retest.gem
+docker-compose -f features/rails-app/docker-compose.yml up --build

data/bin/test/ruby-app

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bundle install
+bundle exec rake build
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-app/retest.gem
+docker-compose -f features/ruby-app/docker-compose.yml up --build

data/exe/retest

@@ -6,7 +6,10 @@ $stdout.sync = true
 
 options = Retest::Options.new(ARGV)
 
-return puts options.help if options.help?
+if options.help?
+  $stdout.puts options.help
+  return
+end
 
 Retest.start(options.command) # not blocking
 

data/lib/retest.rb

@@ -25,18 +25,13 @@ module Retest
 
     def build(runner:, repository:)
       Listen.to('.', only: /\.rb$/, relative: true) do |modified, added, removed|
-        STDOUT.puts modified
-        STDOUT.puts added
-        STDOUT.puts removed
         begin
-          if modified.any?
-            system('clear 2>/dev/null') || system('cls 2>/dev/null')
-            runner.run repository.find_test(modified.first.strip)
-          elsif added.any?
-            repository.add(added)
-            system('clear 2>/dev/null') || system('cls 2>/dev/null')
-            runner.run repository.find_test(added.first.strip)
-          end
+          repository.add(added)
+          repository.remove(removed)
+          runner.remove(removed)
+          system('clear 2>/dev/null') || system('cls 2>/dev/null')
+
+          runner.run repository.find_test (modified + added).first
         rescue => e
           puts "Something went wrong: #{e.message}"
         end

data/lib/retest/repository.rb

@@ -10,14 +10,29 @@ module Retest
     end
 
     def find_test(path)
+      return unless path
+      return if path.empty?
+
       cache[path] ||= select_from TestOptions.for(path, files: files)
     end
 
-    def add(new_files)
-      files.push(*new_files)
+    def add(added)
+      return if added && added.empty?
+
+      files.push(*added)
       files.sort!
     end
 
+    def remove(removed)
+      return if removed && removed.empty?
+
+      if removed.is_a?(Array)
+        removed.each { |file| files.delete(file) }
+      else
+        files.delete(removed)
+      end
+    end
+
     private
 
     def select_from(tests)

data/lib/retest/runner.rb

@@ -20,10 +20,20 @@ module Retest
         command == obj.command
       end
 
+      def cached_test_file
+        @cached_test_file
+      end
+
+      def cached_test_file=(value)
+        @cached_test_file = value || @cached_test_file
+      end
+
       def run(test_file = nil)
-        if @cached_test_file = test_file || @cached_test_file
-          puts "Test File Selected: #{@cached_test_file}"
-          system command.gsub('<test>', @cached_test_file)
+        self.cached_test_file = test_file
+
+        if cached_test_file
+          puts "Test File Selected: #{cached_test_file}"
+          system command.gsub('<test>', cached_test_file)
         else
           puts <<~ERROR
             404 - Test File Not Found
@@ -31,12 +41,30 @@ module Retest
           ERROR
         end
       end
+
+      def remove(purged)
+        return if purged.empty?
+
+        if purged.is_a? Array
+          purge_cache if purged.include? cached_test_file
+        elsif purged.is_a? String
+          purge_cache if purged == cached_test_file
+        end
+      end
+
+      private
+
+      def purge_cache
+        @cached_test_file = nil
+      end
     end
 
     HardcodedRunner = Struct.new(:command) do
       def run(_ = nil)
         system command
       end
+
+      def remove(_ = nil); end
     end
   end
 end

data/lib/retest/version.rb

@@ -1,3 +1,3 @@
 module Retest
-  VERSION = "0.8.0.pre"
+  VERSION = "0.8.2"
 end

data/lib/retest/version_control.rb

@@ -31,7 +31,17 @@ module Retest
       end
 
       def files
-        `git ls-files`.split("\n")
+        (untracked_files + tracked_files).sort
+      end
+
+      private
+
+      def untracked_files
+        `git ls-files --other --exclude-standard -z`.split("\x0")
+      end
+
+      def tracked_files
+        `git ls-files -z`.split("\x0")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retest
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre
+  version: 0.8.2
 platform: ruby
 authors:
 - Alexandre Barret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-similarity
@@ -71,6 +71,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/test/hanami-app
+- bin/test/rails-app
+- bin/test/ruby-app
 - exe/retest
 - lib/retest.rb
 - lib/retest/options.rb
@@ -97,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: