bundix 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4a1f9e593fc6268d9cbeed7ff01b5385e31ed5c
-  data.tar.gz: c11ee93310970e0bbe33ec266c4c9f1d3a644d45
+  metadata.gz: 623983fdd769dae25b35ce73300b7c15e2e05406
+  data.tar.gz: 467820098d81bee233d3292e0a26cca9924e5c62
 SHA512:
-  metadata.gz: b76ba25369c18f7fb22e8658ba796514aafabfa965ee1b14469b6d81fd28b8df3437f24dd57aee4b127fd36ba5df9cdb64c30d21756b87c23027a7fe2f37f427
-  data.tar.gz: 1bd4b88b09ab7ebf5170c1da2585ab6ca01df9ffe43d93b2585bc5ab102d70ff8ba1fc073bed790eacce29f8381dafcf1ea8f587d74e21e090cbbd3a4ce09edc
+  metadata.gz: 730d8af2547d66f2fb33e1e5dd5c1afafec4f30dbc896de6f942552f485ae187e001f65ea786486553110f813e798e7cb8010f9c4012f9a82b686cc9b77bf359
+  data.tar.gz: e8e3ffa6148a782fe38c44128e11c86e836681eec0e03fddcccd2800b96a430f8f48f5e0c0923ef4b87787c6ccb14e3e5de18287a1acfe5a36c35f9bf9fa0e62

data/bin/bundix

@@ -10,8 +10,9 @@ require_relative '../lib/bundix'
 options = {
   ruby: 'ruby',
   bundle_pack_path: 'vendor/bundle',
+  gemfile: 'Gemfile',
   lockfile: 'Gemfile.lock',
-  gemset: 'gemset.nix'
+  gemset: 'gemset.nix',
 }
 
 op = OptionParser.new do |o|
@@ -39,18 +40,32 @@ op = OptionParser.new do |o|
     options[:lockfile] = File.expand_path(value)
   end
 
-  o.on '-d', '--dependencies', 'include gem dependencies' do
-    options[:deps] = true
+  o.on '--gemfile=Gemfile', 'path to the Gemfile' do |value|
+    options[:gemfile] = File.expand_path(value)
+  end
+
+  o.on '-d', '--dependencies', 'include gem dependencies (deprecated)' do
+    warn '--dependencies/-d is deprecated because'
+    warn 'dependencies will always be fetched'
   end
 
   o.on '-q', '--quiet', 'only output errors' do
     options[:quiet] = true
   end
 
+  o.on '-l', '--lock', 'generate Gemfile.lock first' do
+    options[:lock] = true
+  end
+
   o.on '-v', '--version', 'show the version of bundix' do
     puts Bundix::VERSION
     exit
   end
+
+  o.on '--env', 'show the environment in bundix' do
+    system('env')
+    exit
+  end
 end
 
 op.parse!
@@ -80,6 +95,15 @@ if options[:init]
   end
 end
 
+if options[:lock]
+  lock = !File.file?(options[:lockfile])
+  lock ||= File.mtime(options[:gemfile]) > File.mtime(options[:lockfile])
+  if lock
+    system('bundle', 'lock')
+    fail 'bundle lock failed' unless $?.success?
+  end
+end
+
 gemset = Bundix.new(options).convert
 
 tempfile = Tempfile.new('gemset.nix', encoding: 'UTF-8')

data/lib/bundix/source.rb

@@ -16,10 +16,37 @@ class Bundix
       Bundix.sh(*args, &block)
     end
 
+    def download(file, url)
+      warn "Downloading #{file} from #{url}"
+      uri = URI(url)
+      open_options = {}
+      if uri.user && uri.password
+        open_options[:http_basic_authentication] = [uri.user, uri.password]
+        uri.user = nil
+        uri.password = nil
+      end
+      open(uri, 'r', 0600, open_options) do |net|
+        File.open(file, 'wb+') { |local|
+          File.copy_stream(net, local)
+        }
+      end
+    end
+
     def nix_prefetch_url(url)
-      sh(NIX_BUILD, '--argstr', 'url', url, FETCHURL_FORCE, &FETCHURL_FORCE_CHECK)
-        .force_encoding('UTF-8')
-    rescue
+      dir = File.expand_path('~/.cache/bundix')
+      FileUtils.mkdir_p dir
+      file = File.join(dir, url.gsub(/[^\w-]+/, '_'))
+
+      unless File.size?(file)
+        download(file, url)
+      end
+
+      return unless File.size?(file)
+
+      sh('nix-prefetch-url', '--type', 'sha256', "file://#{file}")
+        .force_encoding('UTF-8').strip
+    rescue => ex
+      puts ex
       nil
     end
 
@@ -55,7 +82,7 @@ class Bundix
       uri = "#{remote}/gems/#{spec.name}-#{spec.version}.gem"
       result = nix_prefetch_url(uri)
       return unless result
-      result.force_encoding('UTF-8')[SHA256_32]
+      result[SHA256_32]
     rescue => e
       puts "ignoring error during fetching: #{e}"
       puts e.backtrace
@@ -66,8 +93,8 @@ class Bundix
       remotes = spec.source.remotes.map{|remote| remote.to_s.sub(/\/+$/, '') }
       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
+      hash = sh(NIX_HASH, '--type', 'sha256', '--to-base32', hash)[SHA256_32]
       puts "#{hash} => #{spec.name}-#{spec.version}.gem" if $VERBOSE
 
       { type: 'gem',

data/lib/bundix/version.rb

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

data/lib/bundix.rb

@@ -26,11 +26,7 @@ class Bundix
   attr_reader :options
 
   def initialize(options)
-    @options = {
-      quiet: false,
-      tempfile: nil,
-      deps: false
-    }.merge(options)
+    @options = { quiet: false, tempfile: nil }.merge(options)
   end
 
   def convert
@@ -42,9 +38,7 @@ class Bundix
       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']
-      end
+      gems[spec.name]['dependencies'] = spec.dependencies.map(&:name) - ['bundler']
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundix
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler