cucumber-pro 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35dcec69d5a9599d4d30a57ba1edc2d3a7a0d636
-  data.tar.gz: b0b5af3ce80e5f81180ecf337a35ababbd919933
+  metadata.gz: b480901553d723dcc5d4df5f5cbf69556af33d63
+  data.tar.gz: b4af2756d621c2f543d15dd8b3a97e69718ae5d8
 SHA512:
-  metadata.gz: ed859c503bdd207631bc765d19c3432694c0434bc75637428bf8f8b5baf0f7c957411f59054db35459b89108f90e7c0605b1cc4edb15938c942ab0570b2d6c93
-  data.tar.gz: 4f5b098807e4539ba050640fbf354e28b0d1fa63f326faa1471e213e5e5668c4f9c4207f38e8e3730e7afad22137c191687cb21f94584fe44a6d91c6eb442d40
+  metadata.gz: db68949da991567d0d4f45e026b17c0960cd2a409f1790b8bbb26781d6ad5e105ca9b4038792410b193348d3bbfa2fdbcb1aa42f302760a02da1674bcc2dc855
+  data.tar.gz: 469d4188973e72533ef6eb14d812f468ac6f3e6908d8e125c34fd47e54e18defa07fa54d5032daa08c0890fec16264dfe8ce84adae304c632e2c3b3b71642c83

data/CONTRIBUTING.md

@@ -0,0 +1,5 @@
+## Release process
+
+* Update `HISTORY.md`
+* Bump version in `lib/cucumber/pro/version` and commit.
+* Release: `bundle exec rake release`

data/HISTORY.md

@@ -0,0 +1,8 @@
+## [0.0.14](https://github.com/cucumber-ltd/cucumber-pro-ruby/compare/v0.0.13...v0.0.14) (2014-09-02)
+
+* Only publish results if we detect a CI environment.
+* Assign `build_id` from common CI env vars
+
+## [0.0.13](https://github.com/cucumber-ltd/cucumber-pro-ruby/compare/v0.0.12...v0.0.13) (2014-07-07)
+
+* Check `CI` as well as `CUCUMBER_PRO_TOKEN`.

data/Rakefile

@@ -7,14 +7,13 @@ task default: [:rspec, :cucumber]
 
 # Because https://github.com/eventmachine/eventmachine/issues/34
 if ENV['TRAVIS'] && RUBY_PLATFORM =~ /java/
-  ENV['CUCUMBER_PRO_URL']="ws://results.cucumber.pro/ws"
+  # Don't use TLS on JRuby
+  ENV['CUCUMBER_PRO_RESULTS_URL']="ws://results.cucumber.pro/ws"
 end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = ""
-  t.cucumber_opts = "--format Cucumber::Pro --out cucumber-pro.log"
-  t.cucumber_opts << "--format pretty"
+  t.cucumber_opts = "--format pretty"
 end
 
 task :rspec do

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format Cucumber::Pro --out /dev/null

data/features/publish_results.feature

@@ -5,6 +5,7 @@ Feature: Publish results
     Given I set the environment variables to:
       | variable           | value       |
       | CUCUMBER_PRO_TOKEN | valid-token |
+      | BUILD_NUMBER       | 22          |
 
   Scenario: A couple of scenarios
     Given a git repo
@@ -52,4 +53,3 @@ Feature: Publish results
       | status | path                  | location |
       | passed | features/test.feature | 7        |
       | failed | features/test.feature | 8        |
-

data/features/security.feature

@@ -12,5 +12,6 @@ Feature: Security
     When I set the environment variables to:
       | variable           | value         |
       | CUCUMBER_PRO_TOKEN | invalid-token |
+      | CI                 | true          |
     And I run `cucumber -f Cucumber::Pro -o /dev/null -f pretty`
     And the stderr should contain "Access denied"

data/lib/cucumber/pro.rb

@@ -11,7 +11,7 @@ module Cucumber
 
         working_copy = Scm::WorkingCopy.detect
 
-        if token
+        if should_publish
           working_copy.check_clean
           session = WebSocket::Session.new(url, logger, timeout: config.timeout)
         else
@@ -25,15 +25,15 @@ module Cucumber
         yield config
       end
 
+      def config
+        @config ||= Config.new
+      end
+
       private
 
       attr_reader :logger
       private :logger
 
-      def config
-        @config ||= Config.new
-      end
-
       def url
         config.url + "?token=#{token}"
       end
@@ -45,16 +45,22 @@ module Cucumber
       def token
         config.token
       end
+
+      def should_publish
+        config.should_publish
+      end
     end
 
     class Config
-      attr_accessor :url, :logger, :token, :timeout
+      attr_accessor :url, :logger, :token, :should_publish, :timeout, :build_number
     end
 
     # Default config
     configure do |config|
-      config.url     = ENV['CUCUMBER_PRO_URL'] || 'wss://results.cucumber.pro/ws'
+      config.url     = ENV['CUCUMBER_PRO_RESULTS_URL'] || 'wss://results.cucumber.pro/ws'
       config.token   = ENV['CUCUMBER_PRO_TOKEN']
+      config.build_number = ENV['BUILD_NUMBER'] || ENV['CIRCLE_BUILD_NUM'] || ENV['TRAVIS_JOB_NUMBER'] || ENV['bamboo.buildNumber'] || ENV['CI_BUILD_NUMBER']
+      config.should_publish = config.token && (config.build_number || ENV['CI'])
       config.timeout = 5
       if file = ENV['CUCUMBER_PRO_LOG_FILE']
         config.logger = Logger.new(file)

data/lib/cucumber/pro/formatter.rb

@@ -58,7 +58,7 @@ module Cucumber
           repo_url: @working_copy.repo_url,
           branch: @working_copy.branch,
           rev: @working_copy.rev,
-          group: get_run_id,
+          build_id: get_build_number,
           info: Info.new.to_h
         })
       end
@@ -81,8 +81,8 @@ module Cucumber
         })
       end
 
-      def get_run_id
-        SecureRandom.hex
+      def get_build_number
+        Pro.config.build_number || SecureRandom.hex
       end
 
     end

data/lib/cucumber/pro/info.rb

@@ -9,7 +9,7 @@ module Cucumber
         {
           os: "#{RbConfig::CONFIG['host_os']} (#{RbConfig::CONFIG['host_cpu']})",
           platform_version: "#{RbConfig::CONFIG['ruby_install_name']} #{RbConfig::CONFIG['ruby_version']}",
-          tool_version: "cucumber-ruby #{Cucumber::VERSION}}",
+          tool_version: "cucumber-ruby #{Cucumber::VERSION}",
           os_user: Etc.getlogin,
           client_version: "cucumber-pro-ruby #{File.read(File.dirname(__FILE__) + '/version').strip}",
           cmd: ([$PROGRAM_NAME] + ARGV).join(' ')

data/lib/cucumber/pro/scm/working_copy.rb

@@ -36,11 +36,16 @@ module Cucumber
           cmd('git config --get remote.origin.url').last
         end
 
+        # tries to return the name of the origin branch that points to the current HEAD
         def branch
-          branch = cmd("git branch --contains #{rev}").
-            reject { |b| /^\* \(detached from \w+\)/.match b }.
-            first.
-            gsub(/^\* /, '')
+          if remote_refs.empty?
+            # just use local branch name
+            return cmd("git name-rev --name-only HEAD")[0]
+          end
+          if remote_refs.length > 1
+            fail "Multiple remote branches point to this commit: #{remote_refs.join(',')}"
+          end
+          remote_refs.first.gsub(/refs\/remotes\/\w+\//, '')
         end
 
         def rev
@@ -54,6 +59,16 @@ module Cucumber
 
         private
 
+        def remote_refs
+          @remote_refs ||= refs.
+            select { |ref| ref =~ /refs\/remotes/ }.
+            reject { |ref| ref =~ /refs\/remotes\/\w+\/HEAD/ }
+        end
+
+        def refs
+          @refs ||= cmd("git show-ref | grep #{rev}").map { |output| output.split[1] }
+        end
+
         def cmd(cmd)
           Dir.chdir(@path) { `#{cmd}` }.lines.map &:strip
         end

data/lib/cucumber/pro/version

@@ -1 +1 @@
-0.0.13
+0.0.14

data/spec/cucumber/pro/scm/git_working_copy_spec.rb

@@ -10,27 +10,47 @@ module Cucumber
           clean_current_dir
           in_current_dir do
             run_simple "git init"
-            run_simple "git config user.email \"test@test.com\""
-            run_simple "git config user.name \"Test user\""
+            git_config
           end
         end
 
         it "figures out the name of the branch, even on CI" do
+          create_origin_repo
+          clone_origin_repo
+          commit_and_push
+          # check out the remote branch
+          run_simple "git checkout remotes/origin/master"
+          # delete master branch
+          run_simple "git branch -D master"
+          working_copy = WorkingCopy.detect(current_dir)
+          expect( working_copy.branch ).to eq "master"
+        end
+
+        it "figures out the name of the branch, even when the local branch has a different name" do
+          create_origin_repo
+          clone_origin_repo
+          commit_and_push
+          # check out the remote branch with a different name
+          run_simple "git checkout -b foo --track origin/master"
+          working_copy = WorkingCopy.detect(current_dir)
+          expect( working_copy.branch ).to eq "master"
+        end
+
+        it "figures out the name of the branch when that's what's checked out" do
           in_current_dir do
             run_simple "git commit --allow-empty -m 'Initial commit'"
-            run_simple "git rev-parse HEAD"
-            rev = all_stdout.split("\n").last
-            run_simple "git checkout #{rev}"
             working_copy = WorkingCopy.detect(current_dir)
             expect( working_copy.branch ).to eq "master"
           end
         end
 
-        it "figures out the name of the branch when that's what's checked out" do
+        it "figures out the name of the branch when it has a name that looks like a remote branch" do
           in_current_dir do
             run_simple "git commit --allow-empty -m 'Initial commit'"
+            run_simple "git checkout -b remotes/foo/bar"
+            run_simple "git commit --allow-empty -m 'Another commit'"
             working_copy = WorkingCopy.detect(current_dir)
-            expect( working_copy.branch ).to eq "master"
+            expect( working_copy.branch ).to eq "remotes/foo/bar"
           end
         end
 
@@ -43,17 +63,68 @@ module Cucumber
           end
         end
 
-        xit "detects unpushed changes" do
-          # This one is a little trickier to test. I think we may have to fetch commits
-          # from a repo first.
-          in_current_dir do
-            write_file "README.md", "# README"
-            run_simple "git add README.md"
-            run_simple "git commit -am 'I committed but that is not good enough'"
-            working_copy = WorkingCopy.detect(current_dir)
-            expect { working_copy.check_clean }.to raise_error(DirtyWorkingCopy, /Your current branch has commits that haven't been pushed to origin/)
-          end
+        it "detects unpushed changes to an existing file" do
+          create_origin_repo
+          clone_origin_repo
+          commit_and_push "foo"
+          write_file "foo", "contents"
+          run_simple "git add ."
+          run_simple "git commit -m 'foo'"
+          working_copy = WorkingCopy.detect(current_dir)
+          expect { working_copy.check_clean }.to raise_error(DirtyWorkingCopy, /Your current branch has commits that haven't been pushed to origin/)
+        end
+
+        it "detects unpushed changes to a new file" do
+          create_origin_repo
+          clone_origin_repo
+          commit_and_push "foo"
+          run_simple "touch bar"
+          run_simple "git add ."
+          run_simple "git commit -m 'bar'"
+          working_copy = WorkingCopy.detect(current_dir)
+          expect { working_copy.check_clean }.to raise_error(DirtyWorkingCopy, /Your current branch has commits that haven't been pushed to origin/)
         end
+
+        it "detects a dirty working directory" do
+          create_origin_repo
+          clone_origin_repo
+          commit_and_push "foo"
+          write_file "foo", "contents"
+          working_copy = WorkingCopy.detect(current_dir)
+          expect { working_copy.check_clean }.to raise_error(DirtyWorkingCopy, /Please commit and push your changes before running with the Cucumber Pro formatter/)
+        end
+
+        def create_origin_repo
+          create_dir "origin"
+          cd "origin"
+          run_simple "git init --bare"
+          git_config
+          cd ".."
+        end
+
+        def clone_origin_repo
+          run_simple "git clone ./origin local"
+          cd "local"
+          git_config
+        end
+
+        def commit_and_push(filename = 'foo')
+          run_simple "touch #{filename}"
+          run_simple "git add ."
+          run_simple "git commit -m '#{commit_message}'"
+          run_simple "git push origin master"
+        end
+
+        def commit_message
+          @commit_number ||= 0
+          "Commit message #{@commit_number += 1}"
+        end
+
+        def git_config
+          run_simple "git config user.email \"test@test.com\""
+          run_simple "git config user.name \"Test user\""
+        end
+
       end
     end
   end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-pro
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   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'
 - !ruby/object:Gem::Dependency
   name: aruba
   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'
 - !ruby/object:Gem::Dependency
   name: puma
   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'
 - !ruby/object:Gem::Dependency
   name: rack
   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'
 - !ruby/object:Gem::Dependency
   name: anticipate
   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: Client library for publishing results to the Cucumber Pro service
@@ -142,14 +142,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- ".travis.yml"
+- .rspec
+- .travis.yml
+- CONTRIBUTING.md
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
 - cucumber-pro.gemspec
+- cucumber.yml
 - features/publish_results.feature
 - features/security.feature
 - features/step_definitions/steps.rb
@@ -173,17 +176,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -191,7 +194,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-pro-0.0.13
+summary: cucumber-pro-0.0.14
 test_files:
 - features/publish_results.feature
 - features/security.feature
@@ -203,4 +206,3 @@ test_files:
 - spec/cucumber/pro/info_spec.rb
 - spec/cucumber/pro/scm/git_working_copy_spec.rb
 - spec/cucumber/pro/web_socket/worker_spec.rb
-has_rdoc: