delta_test 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba461c2b9065403b53937eb258a5ea5849109c6
-  data.tar.gz: db45db67cd4da906b56449943c1b2fc4cf4d485e
+  metadata.gz: 47f4e1eb57e82c65b8a07fa27ac74a5317abe77d
+  data.tar.gz: 3f4f42d81b721b034d38a205cb16b1c833d9c766
 SHA512:
-  metadata.gz: b02c8a6c10ccc5306dff37b8033f6cf523a06eee8a83e34937da8e423c71ab3ff009157766a13d45e8aab5d9eb01cfe1f8f298d810702f9d26dd0424d53849ee
-  data.tar.gz: 842057a457c81171430e51a5409fdbe8564b152c31ae2c746e82d500e7ea8b8610156f8352036170b811d48792ae9f442fbf354009432edca975339c1f767467
+  metadata.gz: 57d222b76717aa98fffb62a447a488af498b51e9dd678b8d2a48198e48e1f52c4f44ff0b83bd0846635ca96f20dd72f64e4543c4d43c86ea1bc69b8a0f3589af
+  data.tar.gz: 22cd884b4a5907bfe680a711568548c7011925b05a6433c5737aad31d3fdd159b17f17f74c80315502934671645ab3b459b7a8e37eb51bae49d4691b002091ef

data/CHANGELOG.md

@@ -7,6 +7,12 @@ master
 N/A
 
 
+1.0.1
+-----
+
+- [feature] #26 Subversioning to avoid conflicts
+
+
 1.0.0
 -----
 

data/README.md

@@ -63,8 +63,7 @@ Usage
 ```bash
 $ git clone git@example.com:sample/sample_stats.git tmp/delta_test_stats
 $ delta_test stats:clean
-$ delta_test exec rspec spec/models
-$ delta_test exec rspec spec/controllers
+$ delta_test exec rspec
 $ delta_test stats:save
 ```
 
@@ -81,9 +80,9 @@ options:
     --verbose      Print more output.
 
 commands:
-    exec [--force-run] <script> -- <files...>
+    exec [--force] <script> -- <files...>
                    Execute test script using delta_test.
-                   --force-run to force DeltaTest to run full test cases.
+                   --force to force DeltaTest to run full test in profile mode.
 
     specs          List related spec files for changes.
 

data/lib/delta_test.rb

@@ -51,7 +51,7 @@ module DeltaTest
     def tester_id
       return @tester_id if @tester_id
       t = Time.now
-      @tester_id = 'p%dt%dn%d' % [$$, t.to_i, t.nsec]
+      @tester_id = '%d-%d-%d' % [t.to_i, t.nsec, $$]
     end
 
   end

data/lib/delta_test/cli/command_base.rb

@@ -8,9 +8,9 @@ module DeltaTest
     class CommandBase
 
       DEFAULT_OPTIONS = {
-        'verbose'   => false,
-        'force-run' => false,
-        'no-sync'   => false,
+        'verbose' => false,
+        'force'   => false,
+        'no-sync' => false,
       }.freeze
 
       attr_reader(*%i[
@@ -87,6 +87,8 @@ module DeltaTest
       # @params {Integer|Nil} status
       ###
       def exec_with_data(args, ary, status = nil)
+        $stdout.sync = true
+
         Open3.popen3(args) do |i, o, e, w|
           i.write(ary.join("\n")) if ary
           i.close

data/lib/delta_test/cli/exec_command.rb

@@ -10,53 +10,79 @@ module DeltaTest
       SPLITTER    = '--'.freeze
 
       def invoke!
-        if stats.base_commit
-          puts 'Base commit: %s' % [stats.base_commit]
-          puts
-        end
+        retrive_spec_files
+        extract_arg_files
+        filter_spec_files
+        run_command
+      end
 
-        spec_files = nil
-        args = []
+      def stats
+        @stats ||= Stats.new
+      end
 
-        begin
-          unless profile_mode?
-            list.load_table!(stats.table_file_path)
-            list.retrive_changed_files!(stats.base_commit)
+      def list
+        @list ||= RelatedSpecList.new
+      end
 
-            spec_files = list.related_spec_files.to_a
+      def profile_mode?
+        return @profile_mode if defined?(@profile_mode)
+        @profile_mode = !stats.base_commit || !!@options['force']
+      end
+
+      def retrive_spec_files
+        return if profile_mode?
+
+        puts 'Base commit: %s' % [stats.base_commit]
+        puts
+
+        list.load_table!(stats.table_file_path)
+        list.retrive_changed_files!(stats.base_commit)
 
-            if spec_files.empty?
-              exit_with_message(0, 'Nothing to test')
-            end
-          end
-        rescue TableNotFoundError
-          # force profile mode cuz we don't have a table
-          @profile_mode = true
+        @spec_files = list.related_spec_files.to_a
+
+        if @spec_files.empty?
+          exit_with_message(0, 'Nothing to test')
         end
+      rescue TableNotFoundError
+        # force profile mode cuz we don't have a table
+        @profile_mode = true
+      end
 
+      def extract_arg_files
         @args.map! { |arg| Shellwords.escape(arg) }
 
-        if (splitter = @args.index(SPLITTER))
-          files = @args.drop(splitter + 1)
+        splitter = @args.index(SPLITTER)
+        return unless splitter
+
+        @arg_files = @args.drop(splitter + 1)
+        if @arg_files && @arg_files.any?
           @args = @args.take(splitter)
+        else
+          @arg_files = nil
+        end
+      end
+
+      def filter_spec_files
+        return unless @arg_files
 
-          if files && files.any?
-            if spec_files
-              pattern = files.map { |file| Regexp.escape(file) }
-              pattern = '^(%s)' % pattern.join('|')
-              spec_files = spec_files.grep(pattern)
-            else
-              spec_files = files
-            end
-          end
+        if @spec_files
+          pattern = @arg_files.map { |file| Regexp.escape(file) }
+          pattern = '^(%s)' % pattern.join('|')
+          @spec_files = @spec_files.grep(pattern)
+        else
+          @spec_files = @arg_files
         end
+      end
+
+      def run_command
+        args = []
 
         if profile_mode?
           args << ('%s=%s' % [VERBOSE_FLAG, true]) if DeltaTest.verbose?
           args << ('%s=%s' % [ACTIVE_FLAG, true])
         end
 
-        if spec_files
+        if @spec_files
           args.unshift('cat', '|')
           args << 'xargs'
         end
@@ -67,27 +93,7 @@ module DeltaTest
 
         args += @args
 
-        $stdout.sync = true
-
-        exec_with_data(args.join(' '), spec_files)
-      end
-
-      def stats
-        @stats ||= Stats.new
-      end
-
-      def list
-        @list ||= RelatedSpecList.new
-      end
-
-      ###
-      # Whether run full test or not
-      #
-      # @return {Boolean}
-      ###
-      def profile_mode?
-        return @profile_mode if defined?(@profile_mode)
-        @profile_mode = !stats.base_commit && !@options['force-run']
+        exec_with_data(args.join(' '), @spec_files)
       end
 
     end

data/lib/delta_test/cli/help_command.rb

@@ -11,9 +11,9 @@ options:
     --verbose      Print more output.
 
 commands:
-    exec [--force-run] <script> -- <files...>
+    exec [--force] <script> -- <files...>
                    Execute test script using delta_test.
-                   --force-run to force DeltaTest to run full test cases.
+                   --force to force DeltaTest to run full test in profile mode.
 
     specs          List related spec files for changes.
 

data/lib/delta_test/configuration.rb

@@ -44,17 +44,15 @@ module DeltaTest
     CONFIG_FILES = [
       'delta_test.yml',
       'delta_test.yaml',
-    ].freeze
-
-    PART_FILE_EXT = '.part-%s'
+    ].map(&:freeze).freeze
 
     attr_accessor(*%i[
       base_path
-      files
-
       stats_path
       stats_life
 
+      files
+
       patterns
       exclude_patterns
       full_test_patterns
@@ -74,14 +72,6 @@ module DeltaTest
       Git.new(self.base_path).git_repo?
     end
 
-    validate :files, 'need to be an array' do
-      self.files.is_a?(Array)
-    end
-
-    validate :patterns, 'need to be an array' do
-      self.patterns.is_a?(Array)
-    end
-
     validate :stats_path, 'need to be an absolute path' do
       self.stats_path.absolute? rescue false
     end
@@ -94,6 +84,14 @@ module DeltaTest
       self.stats_life.is_a?(Integer) && self.stats_life > 0
     end
 
+    validate :files, 'need to be an array' do
+      self.files.is_a?(Array)
+    end
+
+    validate :patterns, 'need to be an array' do
+      self.patterns.is_a?(Array)
+    end
+
     validate :exclude_patterns, 'need to be an array' do
       self.exclude_patterns.is_a?(Array)
     end
@@ -112,12 +110,12 @@ module DeltaTest
 
     def initialize
       update(validate: false) do |c|
-        c.base_path = File.expand_path('.')
-        c.files     = []
-
+        c.base_path  = File.expand_path('.')
         c.stats_path = File.expand_path('tmp/delta_test_stats')
         c.stats_life = 1000  # commits
 
+        c.files     = []
+
         c.patterns           = []
         c.exclude_patterns   = []
         c.full_test_patterns = []
@@ -171,10 +169,7 @@ module DeltaTest
       filtered_files = self.files
         .map { |f| Utils.regulate_filepath(f, self.base_path) }
         .uniq
-
-      filtered_files = Utils.files_grep(filtered_files, self.patterns, self.exclude_patterns)
-
-      @filtered_files = Set.new(filtered_files)
+      @filtered_files = Utils.files_grep(filtered_files, self.patterns, self.exclude_patterns).to_set
 
       @stats_path = Pathname.new(File.absolute_path(self.stats_path, self.base_path))
     end

data/lib/delta_test/stats.rb

@@ -6,24 +6,31 @@ module DeltaTest
     attr_reader :base_git
     attr_reader :stats_git
 
-    TABLE_FILENAME = 'table.marshal'
+    TABLE_FILENAME_TPL     = '%s.table'.freeze
+    TABLE_FILENAME_PATTERN = '*.table'.freeze
 
     def initialize(head: false)
+      @head = !!head
+
       @base_git  = Git.new(DeltaTest.config.base_path)
       @stats_git = Git.new(DeltaTest.config.stats_path)
-
-      @base_commit = @base_git.rev_parse('HEAD') if head
     end
 
     def base_commit
       return @base_commit if defined?(@base_commit)
 
-      indexes = @stats_git.ls_files
-        .map { |f| f.split('/').take(2).join('') }
-        .to_set
+      if @head
+        @base_commit = @base_git.rev_parse('HEAD')
+      else
+        indexes = @stats_git.ls_files
+          .map { |f| f.split('/').take(2).join('') }
+          .to_set
+
+        @base_commit = @base_git.ls_hashes(DeltaTest.config.stats_life)
+          .find { |h| indexes.include?(h) }
+      end
 
-      @base_commit = @base_git.ls_hashes(DeltaTest.config.stats_life)
-        .find { |h| indexes.include?(h) }
+      @base_commit
     end
 
     def commit_dir
@@ -34,7 +41,20 @@ module DeltaTest
     end
 
     def table_file_path
-      commit_dir && commit_dir.join(TABLE_FILENAME)
+      return unless commit_dir
+      return @table_file_path if defined?(@table_file_path)
+
+      if @head
+        @table_file_path = commit_dir.join(TABLE_FILENAME_TPL % [DeltaTest.tester_id])
+      else
+        file = Dir.glob(commit_dir.join(TABLE_FILENAME_PATTERN)).max do |f|
+          File.basename(f).split('-').take(2).join('.').to_f
+        end
+        @table_file_path = file
+        @table_file_path = Pathname.new(file) if file
+      end
+
+      @table_file_path
     end
 
   end

data/lib/delta_test/version.rb

@@ -2,7 +2,7 @@ module DeltaTest
 
   MAJOR    = 1
   MINOR    = 0
-  REVISION = 0
+  REVISION = 1
 
   VERSION = [MAJOR, MINOR, REVISION].compact.join('.')
 

data/spec/lib/delta_test/cli/command_base_spec.rb

@@ -100,17 +100,17 @@ describe DeltaTest::CLI::CommandBase do
 
         expect(options).to be_a(Hash)
 
-        expect(options['force-run']).to eq(false)
+        expect(options['force']).to eq(false)
         expect(options['verbose']).to eq(false)
       end
 
       it 'should be able to overwrite default options' do
-        args = ['--force-run', '--verbose']
+        args = ['--force', '--verbose']
         options = command_base.parse_options!(args)
 
         expect(options).to be_a(Hash)
 
-        expect(options['force-run']).to eq(true)
+        expect(options['force']).to eq(true)
         expect(options['verbose']).to eq(true)
       end
 

data/spec/lib/delta_test/cli/exec_command_spec.rb

@@ -26,6 +26,7 @@ describe DeltaTest::CLI::ExecCommand do
     allow(command.list).to receive(:related_spec_files).and_return(related_spec_files)
 
     allow(command.stats).to receive(:base_commit).and_return(base_commit)
+    allow(command.stats).to receive(:table_file_path).and_return(nil)
   end
 
   describe '#profile_mode?' do
@@ -45,13 +46,13 @@ describe DeltaTest::CLI::ExecCommand do
       expect(command.profile_mode?).to be(true)
     end
 
-    context 'with --force-run' do
+    context 'with --force' do
 
-      let(:args) { ['--force-run', 'bundle', 'exec', 'rspec'] }
+      let(:args) { ['--force', 'bundle', 'exec', 'rspec'] }
 
-      it 'should always return false' do
+      it 'should always return true' do
         allow(command.stats).to receive(:base_commit).and_return(nil)
-        expect(command.profile_mode?).to be(false)
+        expect(command.profile_mode?).to be(true)
       end
 
     end

data/spec/lib/delta_test/cli/specs_command_spec.rb

@@ -18,6 +18,7 @@ describe DeltaTest::CLI::SpecsCommand do
     allow(command.list).to receive(:related_spec_files).and_return(related_spec_files)
 
     allow(command.stats).to receive(:base_commit).and_return(base_commit)
+    allow(command.stats).to receive(:table_file_path).and_return(nil)
   end
 
   describe '#invoke!' do

data/spec/lib/delta_test/stats_spec.rb

@@ -30,9 +30,10 @@ describe DeltaTest::Stats do
   let(:files) do
     [
       '11/11111111111111111111111111111111111111/foo.txt',
-      '11/11111111111111111111111111111111111111/table.marshal',
+      '11/11111111111111111111111111111111111111/1000000000-1000000-100.table',
       '33/33333333333333333333333333333333333333/bar.txt',
-      '33/33333333333333333333333333333333333333/table.marshal',
+      '33/33333333333333333333333333333333333333/2000000000-1000000-100.table',
+      '33/33333333333333333333333333333333333333/1000000000-1000000-100.table',
     ]
   end
 
@@ -41,6 +42,11 @@ describe DeltaTest::Stats do
       .with(DeltaTest.config.stats_life)
       .and_return(commit_hashes)
     allow_any_instance_of(DeltaTest::Git).to receive(:ls_files).and_return([])
+
+    files.each do |file|
+      file = DeltaTest.config.stats_path.join(file)
+      FakeFS::FileSystem.add(file, FakeFS::FakeFile.new)
+    end
   end
 
   describe '#base_commit' do
@@ -73,9 +79,9 @@ describe DeltaTest::Stats do
 
   describe '#table_file_path' do
 
-    let(:table_file_path) { DeltaTest.config.stats_path.join('33/33333333333333333333333333333333333333/table.marshal') }
+    let(:table_file_path) { DeltaTest.config.stats_path.join('33/33333333333333333333333333333333333333/2000000000-1000000-100.table') }
 
-    it 'should return a path of table file' do
+    it 'should return a path of the newest table file' do
       allow_any_instance_of(DeltaTest::Git).to receive(:ls_files).and_return(files)
       expect(stats.table_file_path).to eq(table_file_path)
     end
@@ -86,4 +92,36 @@ describe DeltaTest::Stats do
 
   end
 
+  context 'head: true' do
+
+    let(:stats) { DeltaTest::Stats.new(head: true) }
+
+    let(:head_commit) { '4444444444444444444444444444444444444444' }
+
+    before do
+      allow_any_instance_of(DeltaTest::Git).to receive(:rev_parse)
+        .with('HEAD')
+        .and_return(head_commit)
+    end
+
+    describe '#base_commit' do
+
+      it 'should return a commit hash of HEAD' do
+        expect(stats.base_commit).to eq(head_commit)
+      end
+
+    end
+
+    describe '#table_file_path' do
+
+      let(:table_file_path) { DeltaTest.config.stats_path.join('44/44444444444444444444444444444444444444/%s.table' % [DeltaTest.tester_id]) }
+
+      it 'should return a path of the current tester_id' do
+        expect(stats.table_file_path).to eq(table_file_path)
+      end
+
+    end
+
+  end
+
 end

data/spec/lib/delta_test_spec.rb

@@ -120,7 +120,7 @@ describe DeltaTest do
 
     it 'should return an unique id for process' do
       expect(DeltaTest.tester_id).to be_a(String)
-      expect(DeltaTest.tester_id).to match(/\Ap\d+t\d+n\d+\z/)
+      expect(DeltaTest.tester_id).to match(/\A\d+-\d+-\d+\z/)
     end
 
   end

data/spec/rails/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: ../..
   specs:
-    delta_test (1.0.0)
+    delta_test (1.0.1)
 
 GEM
   remote: https://rubygems.org/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delta_test
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler