bibliothecary 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503d92831beea6d895ffa71988660250ca17d939
-  data.tar.gz: d3e6a6d3025c289efd78f2f55720aa0b179062c0
+  metadata.gz: b092f733939c50c7d5d10f1f9e9354f542bab34c
+  data.tar.gz: 8c2f5354c5a25d71128e22e865bc0a384c930728
 SHA512:
-  metadata.gz: a62dd70d17c2b7ca5d2ec13c0370a32b584dcc5af0d2fd111535f438536d63337a8826afebbc7d10be129513c48710ff617e4322be13524f4b2b1898fd0222ea
-  data.tar.gz: dcdeb33cf447f31689d4c652ea3e94bdd9cf49713dd8a119d2419c23316c5110c31b1d5ba62a8f6cd5f58809b80206c78bc1f8a9d61d578bd82a985f142117ce
+  metadata.gz: fa31c0a393a9c02496f6a8626a3d21d31a8c01a2c61711efd63d88c4e64f783c90fc08ce96eac8cf2958c4f637a128ae6bebaf77dec86893fec4ed43a8f89f0b
+  data.tar.gz: 06f3a436681bf61b0219b498ce5071c04d4f25c5809942770e8a17e80d41213ec5b8fe8cc0c8bc76ace1a8764f20741f5747f1c8fe5f25e1e5a0336f41732a53

data/bibliothecary.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "toml-rb", "~> 0.3.9"
   spec.add_dependency "librariesio-gem-parser"
-  spec.add_dependency "rogdl"
   spec.add_dependency "ox"
   spec.add_dependency "typhoeus"
   spec.add_dependency "deb_control"

data/lib/bibliothecary/parsers/carthage.rb

@@ -1,5 +1,3 @@
-require 'cartfile_parser'
-
 module Bibliothecary
   module Parsers
     class Carthage
@@ -7,11 +5,11 @@ module Bibliothecary
 
       def self.parse(filename, file_contents)
         if filename.match(/^Cartfile$/)
-          manifest = CartfileParser.new(:runtime, file_contents).dependencies
+          parse_cartfile(file_contents)
         elsif filename.match(/^Cartfile\.private$/)
-          manifest = CartfileParser.new(:runtime, file_contents).dependencies
+          parse_cartfile_private(file_contents)
         elsif filename.match(/^Cartfile\.resolved$/)
-          manifest = CartfileParser.new(:runtime, file_contents).dependencies
+          parse_cartfile_resolved(file_contents)
         else
           []
         end
@@ -29,7 +27,7 @@ module Bibliothecary
         path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile$/) }
         return unless path
 
-        manifest = CartfileParser.new(:runtime, File.open(path).read)
+        manifest = parse_cartfile(File.open(path).read)
 
         {
           platform: PLATFORM_NAME,
@@ -42,7 +40,7 @@ module Bibliothecary
         path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile\.private$/) }
         return unless path
 
-        manifest = CartfileParser.new(:runtime, File.open(path).read)
+        manifest = parse_cartfile_private(File.open(path).read)
 
         {
           platform: PLATFORM_NAME,
@@ -55,7 +53,7 @@ module Bibliothecary
         path = file_list.find{|path| path.gsub(folder_path, '').gsub(/^\//, '').match(/^Cartfile\.resolved$/) }
         return unless path
 
-        manifest = CartfileParser.new(:runtime, File.open(path).read)
+        manifest = parse_cartfile_resolved(File.open(path).read)
 
         {
           platform: PLATFORM_NAME,
@@ -64,6 +62,44 @@ module Bibliothecary
         }
       end
 
+      def self.parse_cartfile(manifest)
+        response = Typhoeus.post("https://carthageparser.herokuapp.com/cartfile", params: {body: manifest})
+        json = JSON.parse(response.body)
+
+        json.map do |dependency|
+          {
+            name: dependency['name'],
+            version: dependency['version'],
+            type: dependency["type"]
+          }
+        end
+      end
+
+      def self.parse_cartfile_private(manifest)
+        response = Typhoeus.post("https://carthageparser.herokuapp.com/cartfile.private", params: {body: manifest})
+        json = JSON.parse(response.body)
+
+        json.map do |dependency|
+          {
+            name: dependency['name'],
+            version: dependency['version'],
+            type: dependency["type"]
+          }
+        end
+      end
+
+      def self.parse_cartfile_resolved(manifest)
+        response = Typhoeus.post("https://carthageparser.herokuapp.com/cartfile.resolved", params: {body: manifest})
+        json = JSON.parse(response.body)
+
+        json.map do |dependency|
+          {
+            name: dependency['name'],
+            version: dependency['version'],
+            type: dependency["type"]
+          }
+        end
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rogdl
-  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: ox
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,6 @@ files:
 - lib/bibliothecary/parsers/rubygems.rb
 - lib/bibliothecary/parsers/shard.rb
 - lib/bibliothecary/version.rb
-- lib/cartfile_parser.rb
 - lib/sdl_parser.rb
 homepage: https://github.com/librariesio/bibliothecary
 licenses:

data/lib/cartfile_parser.rb

@@ -1,29 +0,0 @@
-require 'rogdl'
-
-class CartfileParser
-  attr_reader :contents, :type
-  def initialize(type, contents)
-    @contents = contents
-    @type = type || 'runtime'
-  end
-
-  def to_json
-    Oj.dump(dependencies, mode: :compat) unless contents.nil?
-  end
-
-  def dependencies
-    parse.inject([]) do |deps, dep|
-      deps.push({
-        name: dep[1],
-        version: [dep[2],dep[3]].join(' ') || ">= 0",
-        type: type,
-      })
-    end.uniq
-  end
-
-  def parse
-    parser = Rogdl::Parser.new
-    parser.translate(contents)
-    parser.lines.reject { |line| line.empty? }
-  end
-end