knapsack 0.5.0 → 1.0.0

data/spec/knapsack/presenter_spec.rb

@@ -1,6 +1,6 @@
 describe Knapsack::Presenter do
   let(:tracker) { instance_double(Knapsack::Tracker) }
-  let(:spec_files_with_time) do
+  let(:test_files_with_time) do
     {
       'a_spec.rb' => 1.0,
       'b_spec.rb' => 0.4
@@ -10,17 +10,17 @@ describe Knapsack::Presenter do
   describe 'report methods' do
     before do
       expect(Knapsack).to receive(:tracker) { tracker }
-      expect(tracker).to receive(:spec_files_with_time).and_return(spec_files_with_time)
+      expect(tracker).to receive(:test_files_with_time).and_return(test_files_with_time)
     end
 
     describe '.report_yml' do
       subject { described_class.report_yml }
-      it { should eql spec_files_with_time.to_yaml }
+      it { should eql test_files_with_time.to_yaml }
     end
 
     describe '.report_json' do
       subject { described_class.report_json }
-      it { should eql JSON.pretty_generate(spec_files_with_time) }
+      it { should eql JSON.pretty_generate(test_files_with_time) }
     end
   end
 
@@ -32,7 +32,7 @@ describe Knapsack::Presenter do
       expect(tracker).to receive(:global_time).and_return(60*62+3)
     end
 
-    it { should eql "\nKnapsack global time execution for specs: 01h 02m 03s" }
+    it { should eql "\nKnapsack global time execution for tests: 01h 02m 03s" }
   end
 
   describe '.report_details' do

data/spec/knapsack/report_spec.rb

@@ -7,27 +7,23 @@ describe Knapsack::Report do
 
   describe '#config' do
     context 'when passed options' do
-      let(:opts) do
+      let(:args) do
         {
-          report_path: 'new_knapsack_report.json',
+          report_path: 'knapsack_new_report.json',
           fake: true
         }
       end
 
       it do
-        expect(report.config(opts)).to eql({
-          report_path: 'new_knapsack_report.json',
+        expect(report.config(args)).to eql({
+          report_path: 'knapsack_new_report.json',
           fake: true
         })
       end
     end
 
     context "when didn't pass options" do
-      it do
-        expect(report.config).to eql({
-          report_path: 'knapsack_report.json'
-        })
-      end
+      it { expect(report.config).to eql({}) }
     end
   end
 

data/spec/knapsack/task_loader_spec.rb

@@ -1,9 +1,11 @@
 describe Knapsack::TaskLoader do
   describe '#load_tasks' do
-    let(:rake_task_path) { "#{Knapsack.root}/lib/tasks/knapsack.rake" }
+    let(:rspec_rake_task_path) { "#{Knapsack.root}/lib/tasks/knapsack_rspec.rake" }
+    let(:cucumber_rake_task_path) { "#{Knapsack.root}/lib/tasks/knapsack_cucumber.rake" }
 
     it do
-      expect(subject).to receive(:import).with(rake_task_path)
+      expect(subject).to receive(:import).with(rspec_rake_task_path)
+      expect(subject).to receive(:import).with(cucumber_rake_task_path)
       subject.load_tasks
     end
   end

data/spec/knapsack/tracker_spec.rb

@@ -1,6 +1,6 @@
 shared_examples 'default trakcer attributes' do
   it { expect(tracker.global_time).to eql 0 }
-  it { expect(tracker.spec_files_with_time).to eql({}) }
+  it { expect(tracker.test_files_with_time).to eql({}) }
 end
 
 describe Knapsack::Tracker do
@@ -45,23 +45,23 @@ describe Knapsack::Tracker do
     end
   end
 
-  describe '#spec_path' do
-    subject { tracker.spec_path }
+  describe '#test_path' do
+    subject { tracker.test_path }
 
-    context 'when spec_path not set' do
+    context 'when test_path not set' do
       it do
-        expect { subject }.to raise_error("spec_path needs to be set by Knapsack Adapter's bind method")
+        expect { subject }.to raise_error("test_path needs to be set by Knapsack Adapter's bind method")
       end
     end
 
-    context 'when spec_path set' do
-      context 'when spec path has prefix ./' do
-        before { tracker.spec_path = './spec/models/user_spec.rb' }
+    context 'when test_path set' do
+      context 'when test_path has prefix ./' do
+        before { tracker.test_path = './spec/models/user_spec.rb' }
         it { should eql 'spec/models/user_spec.rb' }
       end
 
-      context 'when spec path has not prefix ./' do
-        before { tracker.spec_path = 'spec/models/user_spec.rb' }
+      context 'when test_path has not prefix ./' do
+        before { tracker.test_path = 'spec/models/user_spec.rb' }
         it { should eql 'spec/models/user_spec.rb' }
       end
     end
@@ -119,12 +119,12 @@ describe Knapsack::Tracker do
 
   describe 'track time execution' do
     let(:now) { Time.now }
-    let(:spec_paths) { ['a_spec.rb', 'b_spec.rb'] }
+    let(:test_paths) { ['a_spec.rb', 'b_spec.rb'] }
 
     before do
-      spec_paths.each_with_index do |spec_path, index|
+      test_paths.each_with_index do |test_path, index|
         Timecop.freeze(now) do
-          tracker.spec_path = spec_path
+          tracker.test_path = test_path
           tracker.start_timer
         end
 
@@ -137,7 +137,7 @@ describe Knapsack::Tracker do
 
     it { expect(tracker.global_time).to eql 3.0 }
     it do
-      expect(tracker.spec_files_with_time).to eql({
+      expect(tracker.test_files_with_time).to eql({
         'a_spec.rb' => 1.0,
         'b_spec.rb' => 2.0,
       })

data/spec/support/mocks/cucumber.rb

@@ -0,0 +1,12 @@
+# https://github.com/cucumber/cucumber/blob/master/lib/cucumber/rb_support/rb_dsl.rb
+module Cucumber
+  module RbSupport
+    class RbDsl
+      class << self
+        def register_rb_hook(phase, tag_names, proc)
+          proc.call
+        end
+      end
+    end
+  end
+end

data/spec/support/shared_examples/adapter.rb

@@ -1,8 +1,4 @@
 shared_examples 'adapter' do
-  before do
-    expect(::RSpec).to receive(:configure)
-  end
-
   describe '#bind_time_tracker' do
     it do
       expect {

data/spec_examples/leftover/1_spec.rb

@@ -1,4 +1,4 @@
-# this file should not be included in knapsack_report.json
+# this file should not be included in knapsack_rspec_report.json
 describe 'Leftover Fast 1', :custom_focus do
   it {}
 end

data/spec_examples/leftover/a_spec.rb

@@ -1,4 +1,4 @@
-# this file should not be included in knapsack_report.json
+# this file should not be included in knapsack_rspec_report.json
 describe 'Leftover Slow A' do
   it { sleep 1 }
   it { sleep 0.1 }

data/spec_examples/spec_helper.rb

@@ -6,7 +6,7 @@ Knapsack.tracker.config({
   time_offset_in_seconds: 3
 })
 Knapsack.report.config({
-  report_path: 'knapsack_report.json'
+  report_path: 'knapsack_rspec_report.json'
 })
 
 if ENV['CUSTOM_LOGGER']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -86,12 +100,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Parallel specs across CI server nodes based on each spec file's time
-  execution. It generates a spec time execution report and uses it for future test
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Parallel tests across CI server nodes based on each test file's time
+  execution. It generates a test time execution report and uses it for future test
   runs.
 email:
 - arturtrzop@gmail.com
-executables: []
+executables:
+- print_header.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,6 +133,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/print_header.sh
 - docs/images/logos/knapsack-@2.png
 - docs/images/logos/knapsack-big.png
 - docs/images/logos/knapsack-logo-@2.png
@@ -113,12 +143,15 @@ files:
 - docs/images/with_knapsack.png
 - docs/images/without_knapsack.png
 - knapsack.gemspec
-- knapsack_report.json
+- knapsack_rspec_report.json
 - lib/knapsack.rb
 - lib/knapsack/adapters/base_adapter.rb
+- lib/knapsack/adapters/cucumber_adapter.rb
 - lib/knapsack/adapters/rspec_adapter.rb
 - lib/knapsack/allocator.rb
-- lib/knapsack/config.rb
+- lib/knapsack/allocator_builder.rb
+- lib/knapsack/config/env.rb
+- lib/knapsack/config/tracker.rb
 - lib/knapsack/distributors/base_distributor.rb
 - lib/knapsack/distributors/leftover_distributor.rb
 - lib/knapsack/distributors/report_distributor.rb
@@ -128,11 +161,15 @@ files:
 - lib/knapsack/task_loader.rb
 - lib/knapsack/tracker.rb
 - lib/knapsack/version.rb
-- lib/tasks/knapsack.rake
+- lib/tasks/knapsack_cucumber.rake
+- lib/tasks/knapsack_rspec.rake
 - spec/knapsack/adapters/base_adapter_spec.rb
+- spec/knapsack/adapters/cucumber_adapter_spec.rb
 - spec/knapsack/adapters/rspec_adapter_spec.rb
+- spec/knapsack/allocator_builder_spec.rb
 - spec/knapsack/allocator_spec.rb
-- spec/knapsack/config_spec.rb
+- spec/knapsack/config/env_spec.rb
+- spec/knapsack/config/tracker_spec.rb
 - spec/knapsack/distributors/base_distributor_spec.rb
 - spec/knapsack/distributors/leftover_distributor_spec.rb
 - spec/knapsack/distributors/report_distributor_spec.rb
@@ -143,6 +180,7 @@ files:
 - spec/knapsack/tracker_spec.rb
 - spec/knapsack_spec.rb
 - spec/spec_helper.rb
+- spec/support/mocks/cucumber.rb
 - spec/support/shared_examples/adapter.rb
 - spec_examples/fast/1_spec.rb
 - spec_examples/fast/2_spec.rb
@@ -181,12 +219,16 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Parallel specs across CI server nodes based on each spec file's time execution.
+summary: Knapsack splits tests across CI nodes and makes sure that tests will run
+  comparable time on each node.
 test_files:
 - spec/knapsack/adapters/base_adapter_spec.rb
+- spec/knapsack/adapters/cucumber_adapter_spec.rb
 - spec/knapsack/adapters/rspec_adapter_spec.rb
+- spec/knapsack/allocator_builder_spec.rb
 - spec/knapsack/allocator_spec.rb
-- spec/knapsack/config_spec.rb
+- spec/knapsack/config/env_spec.rb
+- spec/knapsack/config/tracker_spec.rb
 - spec/knapsack/distributors/base_distributor_spec.rb
 - spec/knapsack/distributors/leftover_distributor_spec.rb
 - spec/knapsack/distributors/report_distributor_spec.rb
@@ -197,4 +239,5 @@ test_files:
 - spec/knapsack/tracker_spec.rb
 - spec/knapsack_spec.rb
 - spec/spec_helper.rb
+- spec/support/mocks/cucumber.rb
 - spec/support/shared_examples/adapter.rb

data/lib/knapsack/config.rb

@@ -1,40 +0,0 @@
-module Knapsack
-  class Config
-    class << self
-      def report_path
-        ENV['KNAPSACK_REPORT_PATH'] || 'knapsack_report.json'
-      end
-
-      def ci_node_total
-        ENV['CI_NODE_TOTAL'] || ENV['CIRCLE_NODE_TOTAL'] || ENV['SEMAPHORE_THREAD_COUNT'] || 1
-      end
-
-      def ci_node_index
-        ENV['CI_NODE_INDEX'] || ENV['CIRCLE_NODE_INDEX'] || semaphore_current_thread || 0
-      end
-
-      def spec_pattern
-        ENV['KNAPSACK_SPEC_PATTERN'] || 'spec/**/*_spec.rb'
-      end
-
-      def enable_time_offset_warning
-        true
-      end
-
-      def time_offset_in_seconds
-        30
-      end
-
-      def generate_report
-        ENV['KNAPSACK_GENERATE_REPORT'] || false
-      end
-
-      private
-
-      def semaphore_current_thread
-        index = ENV['SEMAPHORE_CURRENT_THREAD']
-        index.to_i - 1 if index
-      end
-    end
-  end
-end

data/lib/tasks/knapsack.rake

@@ -1,20 +0,0 @@
-require 'knapsack'
-
-namespace :knapsack do
-  task :rspec, [:rspec_args] do |t, args|
-    allocator = Knapsack::Allocator.new
-    rspec_args = args[:rspec_args]
-
-    puts
-    puts 'Report specs:'
-    puts allocator.report_node_specs
-    puts
-    puts 'Leftover specs:'
-    puts allocator.leftover_node_specs
-    puts
-
-    cmd = %Q[bundle exec rspec #{rspec_args} --default-path #{allocator.spec_dir} -- #{allocator.stringify_node_specs}]
-
-    exec(cmd)
-  end
-end