inch_ci-worker 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDRkYTBiNGZlMjAwYTM1OWUwM2IxYjFiNDQ3ZmFkNGVhMzg1MzI4Yg==
-  data.tar.gz: !binary |-
-    NjQ0NzIzNzE2YjZkZTk3OTA3M2FhZDNhZTliNGVlZTQ5YWE2MTYzYg==
+SHA1:
+  metadata.gz: 0ade87de9c7f292e99bfa6f398110e81e3f00048
+  data.tar.gz: e1179552ffe534a839bb9eb0408b59171b19f249
 SHA512:
-  metadata.gz: !binary |-
-    NjUwZTdlNDU0YjVhMTY2NzVmYmY2MGUzOTlhMjAzZTkzOGU0NDBkYmI0NTM1
-    NjRkNDNmYzk4NDFkNTdkODVkMzAzMTQ4NjlhMThhYzQ5YTRlYTdiMDUzOTJk
-    ZTUwNmNmNTg1OWVkNTU4ZWE3MTQ1OTFhYjJmMzAyYTk0YzYzYWI=
-  data.tar.gz: !binary |-
-    NWEzZDU1MDA3YWRlMmYyMzE2NTk3ZjM0ZjE4YTE5M2ZiOThiNzM2YWNiNDVi
-    YzQzOWQ1NzY2ODdiMzk3ZTM4OTQ5ZDBhNTVmN2Y5NzViNzY0NjkwMjFiODA0
-    YmQ4NGMzOGU4YmU3NDU3YWVmNzg5NTE2MGZkNTUwNjZiMDA5NmQ=
+  metadata.gz: 5e10993f315b60064b839eb8ada7222ce8ace7ddfe78e88204ef7d621c34aeae5d577464a568baca7bae013a2b250eaee2eebe1165238aba8f326738902e523c
+  data.tar.gz: 343731654428479292ca501e239d83f1be732c65b48ec86b90c25e42d21783847c6fac6537468d5763e662dd516a7fd203c5703fc0102f55e5872af575bd3224

data/bin/inch_ci-worker

@@ -16,8 +16,17 @@ require 'inch_ci/worker'
 
 class Command
   class Build
-    def initialize(url, branch_name = nil, revision = nil)
-      InchCI::Worker::Build::Task.new(url, branch_name, revision)
+    def initialize(url, branch_name = nil, *args)
+      revision, language = nil
+      args.each do |arg|
+        if arg =~ /^--language=(.+)$/
+          language = $1
+        else
+          revision = arg
+        end
+      end
+
+      InchCI::Worker::Build::Task.new(url, branch_name, revision, language)
     end
   end
 

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

@@ -39,6 +39,21 @@ module InchCI
         end
       end
 
+      class ResultDeffered < Result
+        def revision_uid; nil; end
+        def revision_message; nil; end
+        def revision_author_name; nil; end
+        def revision_author_email; nil; end
+        def revision_authored_at; nil; end
+        def tag_uid; nil; end
+        def service_name; nil; end
+        def user_name; nil; end
+        def repo_name; nil; end
+        def status
+          'deffered'
+        end
+      end
+
       class ResultFail < Result
         def revision_uid; nil; end
         def revision_message; nil; end

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

@@ -11,14 +11,14 @@ module InchCI
   module Worker
     module Build
       class Task
-        def initialize(url, branch_name = 'master', revision = nil)
+        def initialize(url, branch_name = 'master', revision = nil, language = nil)
           @work_dir = Dir.mktmpdir
           if revision.nil?
             revision = 'HEAD'
             @latest_revision = true
           end
           started_at = Time.now
-          @result = build(url, branch_name, revision, !!@latest_revision)
+          @result = build(url, branch_name, revision, !!@latest_revision, language)
           @result.finished_at = Time.now
           @result.started_at = started_at
           puts Report.new(@result).to_yaml
@@ -33,12 +33,12 @@ module InchCI
           BadgeDetector.in_readme?(repo, info)
         end
 
-        def build(url, branch_name, revision, latest_revision)
+        def build(url, branch_name, revision, latest_revision, language)
           @url = url
           if retrieve_repo
             if repo.change_branch(branch_name, true)
               if repo.checkout_revision(revision)
-                if @codebase = parse_codebase(repo.path)
+                if @codebase = parse_codebase(language, repo.path)
                   result = ResultSuccess.new(repo, branch_name, latest_revision, @codebase.objects)
                   result.badge_in_readme = badge_in_readme?(result)
                   result
@@ -56,18 +56,48 @@ module InchCI
           end
         end
 
-        def parse_codebase(path)
+        def parse_codebase(language, path)
+          if language.to_s.downcase == 'javascript'
+            parse_javascript_codebase(path)
+          else
+            parse_ruby_codebase(path)
+          end
+        end
+
+        def parse_javascript_codebase(path)
+          dump_file = prepare_javascript_codebase(path)
+          return if dump_file.nil? # this causes ResultParserFailed
+
+          config = to_config(:javascript, path)
+          config.read_dump_file = dump_file
+          begin
+            ::Inch::Codebase.parse(path, config)
+          rescue Exception => e
+            warn e.inspect
+            nil
+          end
+        end
+
+        def parse_ruby_codebase(path)
           YARD::Config.options[:safe_mode] = true
 
           begin
-            language = :ruby # TODO: make dynamic
-            ::Inch::Codebase.parse(path, to_config(language, path))
+            ::Inch::Codebase.parse(path, to_config(:ruby, path))
           rescue Exception => e
             warn e.inspect
             nil
           end
         end
 
+        def prepare_javascript_codebase(path)
+          old_path = Dir.pwd
+          Dir.chdir path
+          `npm install inchjs && inchjs --dry-run`
+          Dir.chdir old_path
+          dump_file = File.join(path, 'docs.json')
+          File.exist?(dump_file) ? dump_file : nil
+        end
+
         def repo
           @repo ||= Repomen::Retriever.new(@url, :work_dir => @work_dir)
         end

data/lib/inch_ci/worker/version.rb

@@ -1,5 +1,5 @@
 module InchCI
   module Worker
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: inch_ci-worker
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - René Föhring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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: simplecov
   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: 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'
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: repomen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0.rc1
 description: ''
@@ -102,9 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Worker for the Inch CI project