bundix 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3faf8fe9a4c8fe4444f90a8bd22c4dbb1ccbcea1
-  data.tar.gz: fbd8ef63ffb26a412d6272cfb4fc6d24db5e5265
+  metadata.gz: 87cf20e1b2e08de0727b71f244018c6b2cfe9355
+  data.tar.gz: c199408c5f4f5f27bd4ef589284aa15b95cd83ba
 SHA512:
-  metadata.gz: 11f2fc22cf75095a582d283a92a667dd28bcf16163bd7904c0aaeab725669398f234cd05ccab3b895622d214db490b9850def133fc34310a56c2a57fbb01fb17
-  data.tar.gz: ef70c7ecc031803ffc77ce21dfa9e96ad0ef5a8023d43091efa4778ac73fcb35af0bfab7784248db67b15f639cf68865402c9132eb76dcd7fe481042f71034b4
+  metadata.gz: 36656b7e9c98794fd16c1171ae976abdbb0f7630f4d4a18b2f9ec8f25bac254e2b9f1c10b1c4f4ede4a7920578db19d420cfa78a09f17f1df10efbaf673a925b
+  data.tar.gz: 8fe879cc5fc86951c37d4f4f7b5f7cdf27ca40391951a5b0c48111cc640e331838d1f3fc42992a163ecb45df51070162f2420d1bc63a21ee457133750efafe55

data/bin/bundix

@@ -1,14 +1,35 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'tmpdir'
+require 'pathname'
 
 require_relative '../lib/bundix'
 
 options = {
+  ruby: 'ruby',
+  bundle_pack_path: 'vendor/bundle',
+  lockfile: 'Gemfile.lock',
   gemset: 'gemset.nix'
 }
 
 op = OptionParser.new do |o|
+  o.on '-m', '--magic', 'lock, pack, and write dependencies' do
+    options[:magic] = true
+  end
+
+  o.on '--ruby=ruby', 'ruby version to use for magic and init, defaults to latest' do |value|
+    options[:ruby] = value
+  end
+
+  o.on '--bundle-pack-path=vendor/bundle', "path to pack the magic" do |value|
+    options[:bundle_pack_path] = value
+  end
+
+  o.on '-i', '--init', "initialize a new shell.nix for nix-shell (won't overwrite old ones)" do
+    options[:init] = true
+  end
+
   o.on '--gemset=gemset.nix', 'path to the gemset.nix' do |value|
     options[:gemset] = File.expand_path(value)
   end
@@ -33,6 +54,31 @@ end
 
 op.parse!
 $VERBOSE = !options[:quiet]
+
+if options[:magic]
+  fail unless system(
+    Bundix::NIX_SHELL, '-p', options[:ruby],
+    "bundler.override { ruby = #{options[:ruby]}; }",
+    "--command", "bundle lock --lockfile=#{options[:lockfile]}")
+  fail unless system(
+    Bundix::NIX_SHELL, '-p', options[:ruby],
+    "bundler.override { ruby = #{options[:ruby]}; }",
+    "--command", "bundle pack --all --path #{options[:bundle_pack_path]}")
+end
+
+if options[:init]
+  if File.file?('shell.nix')
+    warn "won't override existing shell.nix"
+  else
+    shell_nix = File.read(File.expand_path('../template/shell.nix', __dir__))
+    shell_nix.gsub!('PROJECT', File.basename(Dir.pwd))
+    shell_nix.gsub!('RUBY', options[:ruby])
+    shell_nix.gsub!('LOCKFILE', "./#{Pathname(options[:lockfile]).relative_path_from(Pathname('./'))}")
+    shell_nix.gsub!('GEMSET', "./#{Pathname(options[:gemset]).relative_path_from(Pathname('./'))}")
+    File.write('shell.nix', shell_nix)
+  end
+end
+
 gemset = Bundix.new(options).convert
 
 tempfile = Tempfile.new('gemset.nix', encoding: 'UTF-8')

data/lib/bundix.rb

@@ -12,6 +12,7 @@ class Bundix
   NIX_PREFETCH_URL = 'nix-prefetch-url'
   NIX_PREFETCH_GIT = 'nix-prefetch-git'
   NIX_HASH = 'nix-hash'
+  NIX_SHELL = 'nix-shell'
 
   SHA256_32 = %r(^[a-z0-9]{52}$)
   SHA256_16 = %r(^[a-f0-9]{64}$)
@@ -20,8 +21,6 @@ class Bundix
 
   def initialize(options)
     @options = {
-      gemset: './gemset.nix',
-      lockfile: './Gemfile.lock',
       quiet: false,
       tempfile: nil,
       deps: false

data/lib/bundix/version.rb

@@ -1,3 +1,3 @@
 class Bundix
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundix
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Creates Nix packages from Gemfiles.