integration-diff 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c429447679f324211bb8fc6dd8f6b0ededa462
-  data.tar.gz: fa9acec0cc1f55ad7e5b258f9453dc9be7c7cb71
+  metadata.gz: 56099739623d94131dbb655d6f2a6fcc3b7ba644
+  data.tar.gz: a9a405856011a2e5d4750d127fc5302de202a768
 SHA512:
-  metadata.gz: 661bed2fff8991b58d100142a892fb43ce917acf08d5f195e0170cc6f223551f4caccde8cac0c57d693539a1c990608fb1b354dcc8ad4428e95aa198b11fe588
-  data.tar.gz: 8b13946dc473347a79d3af43a46e86a17beedee68279cd48886fa5b447adb4484eaeff7944eaa8f2b4512f0ed9862333d3df7f1a71dc8c481c058f8e766c3d37
+  metadata.gz: 34385079e07bedca35e2d84bc0457707ff769eb471c8182546869d19590b224bef20be92e1cfc5dc5dc1e46c571d87542d469a95922e6a99bc5765bd8e8d7445
+  data.tar.gz: f96ad96632e09ddca7597a81347cd9f37ee4222f5be9ea228331a2c9a079c2249079e1a49bd2dc41ee1f0e3e7c255d2264806f2fc52e12f70b9662120e259bcf

data/Readme.md

@@ -10,9 +10,9 @@ gem 'integration-diff'
 
 ### Configuration
 
-Include `integration-diff-rails` in your rspec `spec_helper` and configure 6 variables
-which will be used while taking screenshots. Make sure that `enable_service` is set to
-to true if images need to be uploaded.
+Include `integration-diff` in your rspec `spec_helper` and configure 6 variables
+which will be used while taking screenshots. Make sure that `enable_service` is
+set to true if images need to be uploaded.
 
 **NOTE:** Make sure that that project exists in service with `project_name`. Also
 api key can be obtained by loggin into service and visiting `/api_key`.

data/lib/integration_diff/run_details.rb

@@ -0,0 +1,55 @@
+module IntegrationDiff
+  class RunDetails
+    class Jenkins
+      def branch
+        ENV.fetch('GIT_BRANCH').split('/').last
+      end
+
+      def author
+        'Jenkins'.freeze
+      end
+    end
+
+    class Travis
+      def branch
+        ENV.fetch('TRAVIS_BRANCH')
+      end
+
+      def author
+        'Travis'.freeze
+      end
+    end
+
+    class GitRepo
+      def branch
+        `git rev-parse --abbrev-ref HEAD`.strip
+      end
+
+      def author
+        `git config user.name`.strip
+      end
+    end
+
+    class Default
+      def branch
+        'HEAD'.freeze
+      end
+
+      def author
+        'None'.freeze
+      end
+    end
+
+    def details
+      if !!ENV['JENKINS_HOME']
+        Jenkins.new
+      elsif !!ENV['TRAVIS']
+        Travis.new
+      elsif system('git branch')
+        GitRepo.new
+      else
+        Default.new
+      end
+    end
+  end
+end

data/lib/integration_diff/runner.rb

@@ -1,11 +1,12 @@
 require 'time'
 require 'json'
+require 'integration_diff/run_details'
 
 module IntegrationDiff
   class Runner
     include Capybara::DSL
 
-    DIR = 'tmp/idff_images'
+    DIR = 'tmp/idiff_images'.freeze
 
     def self.instance
       @runner ||= Runner.new(IntegrationDiff.base_uri,
@@ -17,6 +18,8 @@ module IntegrationDiff
       @base_uri = base_uri
       @project_name = project_name
       @javascript_driver = javascript_driver
+
+      Dir.mkdir('tmp') unless Dir.exist?('tmp')
       Dir.mkdir(DIR) unless Dir.exist?(DIR)
     end
 
@@ -35,7 +38,7 @@ module IntegrationDiff
         upload_image(identifier)
       end
 
-      finalize_run if @run_id
+      complete_run if @run_id
     rescue StandardError => e
       IntegrationDiff.logger.fatal e.message
       raise e
@@ -52,10 +55,9 @@ module IntegrationDiff
     def draft_run
       run_name = @project_name + "-" + Time.now.iso8601
 
-      # will have to make it configurable. ie, read from env.
-      # https://github.com/code-mancers/integration-diff.rb/pull/4#discussion-diff-42290464
-      branch = `git rev-parse --abbrev-ref HEAD`.strip
-      author = `git config user.name`.strip
+      details = IntegrationDiff::RunDetails.new.details
+      branch = details.branch
+      author = details.author
       project = IntegrationDiff.project_name
 
       response = connection.post('/api/v1/runs',
@@ -66,17 +68,18 @@ module IntegrationDiff
     end
 
     def upload_image(identifier)
+      IntegrationDiff.logger.fatal "uploading #{identifier}"
       image_io = Faraday::UploadIO.new(image_file(identifier), 'image/png')
       connection.post("/api/v1/runs/#{@run_id}/run_images",
                       identifier: identifier, image: image_io)
     end
 
-    def finalize_run
-      connection.put("/api/v1/runs/#{@run_id}/status", status: "finalized")
+    def complete_run
+      connection.put("/api/v1/runs/#{@run_id}/status", status: "completed")
     end
 
     def image_file(identifier)
-      "#{DIR}/#{identifier}.png"
+      "#{Dir.pwd}/#{DIR}/#{identifier}.png"
     end
 
     def connection

data/lib/integration_diff/version.rb

@@ -1,3 +1,3 @@
 module IntegrationDiff
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: integration-diff
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,7 @@ files:
 - lib/integration_diff.rb
 - lib/integration_diff/dsl.rb
 - lib/integration_diff/dummy_runner.rb
+- lib/integration_diff/run_details.rb
 - lib/integration_diff/runner.rb
 - lib/integration_diff/version.rb
 homepage: http://diff.codemancers.com