bundix 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b1635b56596e63fa5290d2f2bb51de41ea624d
-  data.tar.gz: 605180b6803b0c38c7aa6b473c3bbfd91726f012
+  metadata.gz: 396e7d0bc64e702a8aa6be3de6d01557828e74d9
+  data.tar.gz: 8c269513efaa9958b835273768a3ce1bd8fe2137
 SHA512:
-  metadata.gz: 19419fc6a8c382dcd8c44d83b76fb3b71dddcb17bebc3eb7125778ca97cc37472b5f29cecbda9ff19f2c6da552b443610f4e44596c5e9a21e10e0fe03d3235bc
-  data.tar.gz: 89884730995838a078ac29f0de29d87490a2904a3d0663495ae2a0b7ce3376e27a2561f31fb391fad9e71cdea98539f67d9a85c0ffd836f77f9a10565b85ec0f
+  metadata.gz: 76ce621cbfcf70d908e0ce94416a021bf9599133bb4922ece0c01ef2fcf4a3c8ab5cf62ccaafe13f14fe592f1de0e4113e636d50362a30324fc9a277327a3455
+  data.tar.gz: 86534b85654782d92eea6e773a7ace2b0d1edb69db5dfb16d0268f5bb7d9a91ab7b5e3357977b75c509266ecf30354cc9fd2a73e67f57091c41f1c8c26e44efc

data/lib/bundix/source.rb

@@ -18,6 +18,8 @@ class Bundix
 
     def nix_prefetch_url(*args)
       sh(NIX_PREFETCH_URL, '--type', 'sha256', *args)
+    rescue
+      nil
     end
 
     def nix_prefetch_git(uri, revision)
@@ -32,10 +34,8 @@ class Bundix
       spec.source.caches.each do |cache|
         path = File.join(cache, "#{spec.name}-#{spec.version}.gem")
         next unless File.file?(path)
-        begin
-          return nix_prefetch_url("file://#{path}")[SHA256_32]
-        rescue
-        end
+        hash = nix_prefetch_url("file://#{path}")[SHA256_32]
+        return hash if hash
       end
 
       nil
@@ -43,55 +43,31 @@ class Bundix
 
     def fetch_remotes_hash(spec, remotes)
       remotes.each do |remote|
-        begin
-          return fetch_remote_hash(spec, remote)
-        rescue
-        end
+        hash = fetch_remote_hash(spec, remote)
+        return remote, hash if hash
       end
 
       nil
     end
 
     def fetch_remote_hash(spec, remote)
-      hash = nil
-
-      if URI(remote).host == 'rubygems.org'
-        uri = "#{remote}/api/v1/versions/#{spec.name}.json"
-        puts "Getting SHA256 from: #{uri}" if $VERBOSE
-        open uri do |io|
-          versions = JSON.parse(io.read)
-          if found_version = versions.find{|obj| obj['number'] == spec.version.to_s }
-            hash = found_version['sha']
-            break
-          end
-        end
-      end
-
       uri = "#{remote}/gems/#{spec.name}-#{spec.version}.gem"
-
-      if hash
-        begin
-          nix_prefetch_url(uri, hash)[SHA256_16]
-        rescue
-          nix_prefetch_url(uri)[SHA256_32]
-        end
-      else
-        nix_prefetch_url(uri)[SHA256_32]
-      end
+      nix_prefetch_url(uri)[SHA256_32]
+    rescue
+      nil
     end
 
     def convert_rubygems
       remotes = spec.source.remotes.map{|remote| remote.to_s.sub(/\/+$/, '') }
-      hash = fetch_local_hash(spec) || fetch_remotes_hash(spec, remotes)
+      hash = fetch_local_hash(spec)
+      remote, hash = fetch_remotes_hash(spec, remotes) unless hash
       hash = sh(NIX_HASH, '--type', 'sha256', '--to-base32', hash)[SHA256_32]
       fail "couldn't fetch hash for #{spec.name}-#{spec.version}" unless hash
       puts "#{hash} => #{spec.name}-#{spec.version}.gem" if $VERBOSE
 
-      {
-        type: 'gem',
-        remotes: remotes,
-        sha256: hash
-      }
+      { type: 'gem',
+        remotes: (remote ? [remote] : remotes),
+        sha256: hash }
     end
 
     def convert_git
@@ -102,13 +78,11 @@ class Bundix
       fail "couldn't fetch hash for #{spec.name}-#{spec.version}" unless hash
       puts "#{hash} => #{uri}" if $VERBOSE
 
-      {
-        type: 'git',
+      { type: 'git',
         url: uri.to_s,
         rev: revision,
         sha256: hash,
-        fetchSubmodules: false
-      }
+        fetchSubmodules: false }
     end
   end
 end

data/lib/bundix/version.rb

@@ -0,0 +1,3 @@
+class Bundix
+  VERSION = '2.0.4'
+end

data/lib/bundix.rb

@@ -4,11 +4,10 @@ require 'open-uri'
 require 'open3'
 require 'pp'
 
+require_relative 'bundix/version'
 require_relative 'bundix/source'
 
 class Bundix
-  VERSION = '2.0.3'
-
   NIX_INSTANTIATE = 'nix-instantiate'
   NIX_PREFETCH_URL = 'nix-prefetch-url'
   NIX_PREFETCH_GIT = 'nix-prefetch-git'
@@ -35,21 +34,8 @@ class Bundix
 
     # reverse so git comes last
     lock.specs.reverse_each.with_object({}) do |spec, gems|
-      name, cached = cache.find{|k, v|
-        k == spec.name &&
-          v['version'] == spec.version.to_s &&
-          v['source'] && v['source']['sha256'].to_s.size == 52
-      }
-
-      if cached
-        gems[name] = cached
-        next
-      end
-
-      gems[spec.name] = {
-        version: spec.version.to_s,
-        source: Source.new(spec).convert
-      }
+      gem = find_cached_spec(spec, cache) || convert_spec(spec, cache)
+      gems.merge!(gem)
 
       if options[:deps] && spec.dependencies.any?
         gems[spec.name][:dependencies] = spec.dependencies.map(&:name) - ['bundler']
@@ -57,6 +43,33 @@ class Bundix
     end
   end
 
+  def convert_spec(spec, cache)
+    {spec.name => {version: spec.version.to_s, source: Source.new(spec).convert}}
+  rescue => ex
+    warn "Skipping #{spec.name}: #{ex}"
+    puts ex.backtrace
+    {spec.name => {}}
+  end
+
+  def find_cached_spec(spec, cache)
+    name, cached = cache.find{|k, v|
+      next unless k == spec.name
+      next unless cached_source = v['source']
+
+      case spec_source = spec.source
+      when Bundler::Source::Git
+        next unless cached_rev = cached_source['rev']
+        next unless spec_rev = spec_source.options['revision']
+        spec_rev == cached_rev
+      when Bundler::Source::Rubygems
+        v['version'] == spec.version.to_s
+      end
+    }
+
+    {name => cached} if cached
+  end
+
+
   def parse_gemset
     path = File.expand_path(options[:gemset])
     return {} unless File.file?(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundix
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -34,6 +34,7 @@ files:
 - bin/bundix
 - lib/bundix.rb
 - lib/bundix/source.rb
+- lib/bundix/version.rb
 homepage: https://github.com/manveru/bundix
 licenses:
 - MIT
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Creates Nix packages from Gemfiles.