bundix 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488d15d60c84d0135b90f862ff64711cf8f813c7
-  data.tar.gz: 6362dd81f99f13083cd471e66b47f7492b285ff0
+  metadata.gz: c4a1f9e593fc6268d9cbeed7ff01b5385e31ed5c
+  data.tar.gz: c11ee93310970e0bbe33ec266c4c9f1d3a644d45
 SHA512:
-  metadata.gz: b946fd4555b93beefd8f6d744606cad04ac9a56a10691e4fe02b4cd223e03d3febde7ef81fe7a11c3880faaebfb6673c98f27c25d8cc14e4d5d2e025d4ad178f
-  data.tar.gz: 346c78b7a0d56fccccce86cfccf07d30bb58622036ebb97d1e2af8ff88279c0ada0b48b24607e2e203db0ec60ed73c35178375e704232e7d638ade88306e9750
+  metadata.gz: b76ba25369c18f7fb22e8658ba796514aafabfa965ee1b14469b6d81fd28b8df3437f24dd57aee4b127fd36ba5df9cdb64c30d21756b87c23027a7fe2f37f427
+  data.tar.gz: 1bd4b88b09ab7ebf5170c1da2585ab6ca01df9ffe43d93b2585bc5ab102d70ff8ba1fc073bed790eacce29f8381dafcf1ea8f587d74e21e090cbbd3a4ce09edc

data/bin/bundix

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require 'tmpdir'
+require 'tempfile'
 require 'pathname'
 
 require_relative '../lib/bundix'

data/lib/bundix/fetchurl-force.nix

@@ -0,0 +1,27 @@
+{ nixpkgs ? import <nixpkgs> {}
+, url
+}:
+        
+with nixpkgs;
+
+# (ab)use fetchurl to download a URL and add it to the nix store
+# *without* already knowing its hash.
+fetchurl {
+  inherit url;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+  downloadToTemp = true;
+  postFetch = ''
+    PATH="$PATH:${stdenv.lib.makeBinPath [ nix ]}"
+
+    sha256="$(nix-hash --base32 --type sha256 --flat "$downloadedFile")"
+    printf "%s\n" "$sha256"
+
+    file="$(dirname "$downloadedFile")/$(basename "$url")"
+    mv "$downloadedFile" "$file"
+    echo "adding to nix store..."
+    nix-store --add "$file"
+
+    echo "success! failing outer nix build..."
+    exit 1
+  '';
+}

data/lib/bundix/source.rb

@@ -12,13 +12,13 @@ class Bundix
       end
     end
 
-    def sh(*args)
-      Bundix.sh(*args)
+    def sh(*args, &block)
+      Bundix.sh(*args, &block)
     end
 
-    def nix_prefetch_url(*args)
-      sh(NIX_PREFETCH_URL, '--type', 'sha256', *args)
-      .force_encoding('UTF-8')
+    def nix_prefetch_url(url)
+      sh(NIX_BUILD, '--argstr', 'url', url, FETCHURL_FORCE, &FETCHURL_FORCE_CHECK)
+        .force_encoding('UTF-8')
     rescue
       nil
     end
@@ -53,8 +53,9 @@ class Bundix
 
     def fetch_remote_hash(spec, remote)
       uri = "#{remote}/gems/#{spec.name}-#{spec.version}.gem"
-      result = nix_prefetch_url(uri).force_encoding('UTF-8')
-      result[SHA256_32]
+      result = nix_prefetch_url(uri)
+      return unless result
+      result.force_encoding('UTF-8')[SHA256_32]
     rescue => e
       puts "ignoring error during fetching: #{e}"
       puts e.backtrace

data/lib/bundix/version.rb

@@ -1,3 +1,3 @@
 class Bundix
-  VERSION = '2.1.0'
+  VERSION = '2.2.1'
 end

data/lib/bundix.rb

@@ -11,9 +11,15 @@ class Bundix
   NIX_INSTANTIATE = 'nix-instantiate'
   NIX_PREFETCH_URL = 'nix-prefetch-url'
   NIX_PREFETCH_GIT = 'nix-prefetch-git'
+  NIX_BUILD = 'nix-build'
   NIX_HASH = 'nix-hash'
   NIX_SHELL = 'nix-shell'
 
+  FETCHURL_FORCE = File.expand_path('../bundix/fetchurl-force.nix', __FILE__)
+  FETCHURL_FORCE_CHECK = lambda do |_, out|
+    out =~ /success! failing outer nix build.../
+  end
+
   SHA256_32 = %r(^[a-z0-9]{52}$)
   SHA256_16 = %r(^[a-f0-9]{64}$)
 
@@ -57,10 +63,12 @@ class Bundix
 
       case spec_source = spec.source
       when Bundler::Source::Git
+        next unless cached_source['type'] == 'git'
         next unless cached_rev = cached_source['rev']
         next unless spec_rev = spec_source.options['revision']
         spec_rev == cached_rev
       when Bundler::Source::Rubygems
+        next unless cached_source['type'] == 'gem'
         v['version'] == spec.version.to_s
       end
     }
@@ -110,9 +118,9 @@ class Bundix
     end
   end
 
-  def self.sh(*args)
+  def self.sh(*args, &block)
     out, status = Open3.capture2e(*args)
-    unless status.success?
+    unless block_given? ? block.call(status, out) : status.success?
       puts "$ #{args.join(' ')}" if $VERBOSE
       puts out if $VERBOSE
       fail "command execution failed: #{status}"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bundix
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 description: Creates Nix packages from Gemfiles.
@@ -32,9 +32,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/bundix
+- lib/bundix.rb
+- lib/bundix/fetchurl-force.nix
 - lib/bundix/source.rb
 - lib/bundix/version.rb
-- lib/bundix.rb
 homepage: https://github.com/manveru/bundix
 licenses:
 - MIT
@@ -45,17 +46,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.0.14.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Creates Nix packages from Gemfiles.