inch_ci-worker 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541dd2d55313d87dd726ae9cb99d920da56f75aa
-  data.tar.gz: dc6ad28eb3893993fba71be1ce3544f6f347e8d9
+  metadata.gz: 0a72eee7a66a5707cec965706ff712db4c709968
+  data.tar.gz: 09a6d9d47206de9a98b1cb82670d1c854331fbe8
 SHA512:
-  metadata.gz: 589ead8a604b5177a227761874034a04898169d7f98c704c67431be7be595ab30541ca6acea1258cbdbd473b6df1fbf6ae4701e2e33bf0b9be7b15b3009ecb17
-  data.tar.gz: 4c77886dac2f29b60b14f55d126c778d6f63939c7f913617cf3bb5ae4112c356c51982bef5af0b4e7354a64eaa6857b1efd3a676ea263814ceb81a04a52a3923
+  metadata.gz: ff13541b4254abc0add380c990859a09df1e42c5d6ad1360aa95fc15b091dd506bde34de73fe4ae13dad12ac559be02bba44a6fb548ee85c93423557d2d9e03d
+  data.tar.gz: 41160a5f21f5b2ef19f7cb8e677f77f76994215a44f800d9a65731f30a836a3266a4e3c7ed3d41dd6e3261658dea07c6070df22d1a8f97e546a5c284fbf0a56a

data/bin/inch_ci-worker

@@ -27,9 +27,16 @@ class Command
     end
   end
 
+  class Version
+    def initialize(*args)
+      puts InchCI::Worker::VERSION
+    end
+  end
+
   MAP = {
     'build' => Build,
-    'list-tags' => ListTags
+    'list-tags' => ListTags,
+    '-v' => Version,
   }
 
   def self.run(command_name, args)

data/inch_ci-worker.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
 
-  spec.add_dependency 'repomen'
-  spec.add_dependency "inch", "~> 0.5.0.rc3"
+  spec.add_dependency "inch", ">= 0.5.0.rc3"
+  spec.add_dependency "repomen", ">= 0.2.0.rc1"
 end

data/lib/inch_ci/worker/build/badge_detector.rb

@@ -0,0 +1,32 @@
+module InchCI
+  module Worker
+    module Build
+      class BadgeDetector
+        def self.in_readme?(repo, info)
+          if filename = find_readme(repo)
+            contents = File.read(filename, :encoding => 'utf-8')
+            new(contents, info).detected?
+          else
+            false
+          end
+        end
+
+        # @return [String] filename
+        def self.find_readme(repo)
+          Dir[File.join(repo.path, '*.*')].detect do |f|
+            File.basename(f) =~ /\Areadme\./i
+          end
+        end
+
+        def initialize(contents, info)
+          @contents = contents
+          @pattern = Regexp.escape("inch-ci.org/#{info.service_name}/#{info.user_name}/#{info.repo_name}")
+        end
+
+        def detected?
+          !!( @contents =~ /#{@pattern}/mi )
+        end
+      end
+    end
+  end
+end

data/lib/inch_ci/worker/build/report.rb

@@ -22,6 +22,8 @@ module InchCI
           data['service_name'] = build.service_name.to_s if build.service_name
           data['user_name'] = build.user_name if build.user_name
           data['repo_name'] = build.repo_name if build.repo_name
+          data['badge_in_readme'] = build.badge_in_readme
+          data['inch_version'] = ::Inch::VERSION
           if build.revision_uid
             data['revision_uid'] = build.revision_uid
             data['revision_message'] = build.revision_message

data/lib/inch_ci/worker/build/result.rb

@@ -12,6 +12,7 @@ module InchCI
         def_delegators :repo, :revision_authored_at
 
         attr_accessor :started_at
+        attr_accessor :badge_in_readme
         attr_accessor :finished_at
         attr_writer :status
 

data/lib/inch_ci/worker/build/task.rb

@@ -1,9 +1,10 @@
+require 'tmpdir'
 require 'inch'
 require 'repomen'
-require 'tmpdir'
 
-require_relative 'result'
-require_relative 'report'
+require 'inch_ci/worker/build/result'
+require 'inch_ci/worker/build/report'
+require 'inch_ci/worker/build/badge_detector'
 
 module InchCI
   module Worker
@@ -21,18 +22,25 @@ module InchCI
           @result.started_at = started_at
           puts Report.new(@result).to_yaml
         ensure
-          FileUtils.remove_entry @work_dir
+          FileUtils.remove_entry(@work_dir) unless @work_dir.nil?
         end
 
         private
 
+        # @param info [#service_name,#user_name,#repo_name]
+        def badge_in_readme?(info)
+          BadgeDetector.in_readme?(repo, info)
+        end
+
         def build(url, branch_name, revision, latest_revision)
           @url = url
           if retrieve_repo
             if repo.change_branch(branch_name, true)
               if repo.checkout_revision(revision)
                 if @codebase = parse_codebase(repo.path)
-                  ResultSuccess.new(repo, branch_name, latest_revision, @codebase.objects)
+                  result = ResultSuccess.new(repo, branch_name, latest_revision, @codebase.objects)
+                  result.badge_in_readme = badge_in_readme?(result)
+                  result
                 else
                   ResultParserFailed.new(repo, branch_name, latest_revision, nil)
                 end
@@ -51,7 +59,8 @@ module InchCI
           YARD::Config.options[:safe_mode] = true
           begin
             ::Inch::Codebase.parse(path)
-          rescue
+          rescue Exception => e
+            warn e
             nil
           end
         end

data/lib/inch_ci/worker/version.rb

@@ -1,5 +1,5 @@
 module InchCI
   module Worker
-    VERSION = "0.2.12"
+    VERSION = "0.2.13"
   end
 end

data/test/integration/badge_detector_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+describe ::InchCI::Worker::Build do
+  let(:described_class) { ::InchCI::Worker::Build::Task }
+  let(:branch_name) { 'master' }
+  let(:url) { 'https://github.com/rrrene/inch.git' }
+  let(:incorrect_url) { 'https://github.com/rrrene/tipsy.hovercard.git' }
+
+  #
+  # Good scenario
+  #
+
+  it 'should show badge in readme' do
+    out, err = capture_io do
+      @task = described_class.new(url, branch_name)
+    end
+    refute out.empty?
+    assert_match /status: success/, out
+    assert_match /badge_in_readme: true/, out
+    assert err.empty?
+  end
+
+  #
+  # Bad scenario
+  #
+
+  it 'should show no badge in readme' do
+    out, err = capture_io do
+      @task = described_class.new(incorrect_url, branch_name)
+    end
+    refute out.empty?
+    assert_match /status: success/, out
+    assert_match /badge_in_readme: false/, out
+    assert err.empty?
+  end
+end

data/test/integration/inch_version_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+describe ::InchCI::Worker::Build do
+  let(:described_class) { ::InchCI::Worker::Build::Task }
+  let(:branch_name) { 'master' }
+  let(:url) { 'https://github.com/rrrene/sparkr.git' }
+
+  #
+  # Good scenario
+  #
+
+  it 'should retrieve the repo' do
+    out, err = capture_io do
+      @task = described_class.new(url, branch_name)
+    end
+    refute out.empty?
+    assert_match /status: success/, out
+    assert_match /inch_version: \d+\.\d+\.\d+/, out
+    assert err.empty?
+  end
+end

data/test/unit/worker/build/badge_detector_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+
+describe ::InchCI::Worker::Build::BadgeDetector do
+  let(:described_class) { ::InchCI::Worker::Build::BadgeDetector }
+  let(:info_mock) {
+    OpenStruct.new(:service_name => 'github', :user_name => 'user_name', :repo_name => 'repo_name')
+  }
+  let(:with_badge) {
+    "RepoName\n======\n\n[![Code Climate](https://codeclimate.com/github/user_name/repo_name.png)](https://codeclimate.com/github/user_name/repo_name)\n[![Inline docs](http://inch-ci.org/github/user_name/repo_name.svg?branch=master)](http://inch-ci.org/github/user_name/repo_name)\n\nThink of it like Homebrew for Minecraft.\n\nOf course where every individual projects gets it's own Formula,\n this allowing for mods to declare their runtime dependencies\n and making installing mods more or less painless.\n \n### Requirments\n\nTo run repo_name on your system you a few pieces of software installed. If you use your computer for any sort of development, or your computer runs Mac OS X or any of the main Linux distros, it is likely you already have this software installed. To make sure that your computer is ready to brew Minecraft be sure to check the [wiki page](https://github.com/user_name/repo_name/wiki/Requirements) on requirements for each platform.\n\n### Install\n\nMuch like the inspiring project of this project, installation is simple.\n\nRun this line of code in your system's command prompt and let it walk you through what it is doing.\n\n> On Mac OS X or any other system that uses curl:\n```\nruby -e \"$(curl -fsSL https://raw.github.com/user_name/repo_name/go/install)\"\n```\n\n> On most Linux distros:\n```\nruby -e \"$(wget -O- https://raw.github.com/user_name/repo_name/go/install)\"\n```\n\n> Using Windows PowerShell\n```\n$storageDir = #env.TEMP\n$webclient = New-Object System.Net.WebClient\n$url = \"https://raw.github.com/user_name/repo_name/go/install\"\n$file = \"$storageDir\\repo_name-install\"\n$webclient.DownloadFile($url,$file)\nStart-Process \"$storageDir\\repo_name-install\"\n```\n"
+  }
+  let(:with_badge_single_line) {
+    "[![Code Climate](https://codeclimate.com/github/user_name/repo_name.png)](https://codeclimate.com/github/user_name/repo_name)\n\n\n[![Inline docs](http://inch-ci.org/github/user_name/repo_name.png?branch=master)](http://inch-ci.org/github/user_name/repo_name)"
+  }
+
+  it "should detect badge" do
+    [with_badge, with_badge_single_line].each do |str|
+      assert described_class.new(str, info_mock).detected?
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inch_ci-worker
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - René Föhring
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: repomen
+  name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0.rc3
 - !ruby/object:Gem::Dependency
-  name: inch
+  name: repomen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.2.0.rc1
 description: ''
 email:
 - rf@bamaru.de
@@ -113,6 +113,7 @@ files:
 - inch_ci-worker.gemspec
 - lib/inch_ci/worker.rb
 - lib/inch_ci/worker/build.rb
+- lib/inch_ci/worker/build/badge_detector.rb
 - lib/inch_ci/worker/build/report.rb
 - lib/inch_ci/worker/build/result.rb
 - lib/inch_ci/worker/build/task.rb
@@ -120,8 +121,11 @@ files:
 - lib/inch_ci/worker/list_tags/report.rb
 - lib/inch_ci/worker/list_tags/task.rb
 - lib/inch_ci/worker/version.rb
+- test/integration/badge_detector_test.rb
 - test/integration/build_test.rb
+- test/integration/inch_version_test.rb
 - test/test_helper.rb
+- test/unit/worker/build/badge_detector_test.rb
 homepage: https://github.com/inch-ci/inch_ci-worker
 licenses:
 - MIT
@@ -147,6 +151,9 @@ signing_key:
 specification_version: 4
 summary: Worker for the Inch CI project
 test_files:
+- test/integration/badge_detector_test.rb
 - test/integration/build_test.rb
+- test/integration/inch_version_test.rb
 - test/test_helper.rb
+- test/unit/worker/build/badge_detector_test.rb
 has_rdoc: