appbundler 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6d3790061544bed9cee8bd44d5c94bcd235b46b
-  data.tar.gz: 050a352e5d29f64ad1dd512abeef8759f9a17dfd
+SHA256:
+  metadata.gz: 867a7edc3b0cb2bb729b3ec62f2c7afde7c9fcb46a58d7812d5ff261e1fe864e
+  data.tar.gz: 4c1edc5d6e127e064332406396574b28ae38891eb3c62ff92006dc8f399b18e8
 SHA512:
-  metadata.gz: 46f7c7536c8090ba2ebd83b4678041e89965344cacc40d3d455897884beea826c258080f5add78a1d2387ba397e986863d95abaf4393aad1741e88fbb9d9a37e
-  data.tar.gz: 4b2a888810f9199e41f17ffda7d4be4043d6569be893e46cbb7f9239793a6ad60ca837949d5774b552c2c1308822657e152c161d5647073bf7024058b3520836
+  metadata.gz: c9b76a7be7c70f2cb91e5fe25d80d70133f64abccc55fc40632b44f1d8e6edfceeb9b30111118b566859629b7b4360c6c7f92ef4a0db98e97eea2203c2b736a8
+  data.tar.gz: 1567880de2199ad880710c06169871be66dbb40af131c133ee18f940fe27658618a6f25474cb41b96d0e85d21f6cd8cbe5861071fd6a10e2cd2d57b67e86bac3

data/appbundler.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "mixlib-shellout", "~> 2.0"
 
+  spec.add_dependency "mixlib-shellout", "~> 2.0"
   spec.add_dependency "mixlib-cli", "~> 1.4"
 end

data/lib/appbundler/app.rb

@@ -1,5 +1,7 @@
 require "bundler"
 require "fileutils"
+require "mixlib/shellout"
+require "tempfile"
 require "pp"
 
 module Appbundler
@@ -22,17 +24,112 @@ module Appbundler
       @name = name
     end
 
-    # Copy over any .bundler and Gemfile.lock files to the target gem
-    # directory.  This will let us run tests from under that directory.
-    def copy_bundler_env
-      gem_path = app_gemspec.gem_dir
-      # If we're already using that directory, don't copy (it won't work anyway)
-      return if gem_path == File.dirname(gemfile_lock)
-      FileUtils.install(gemfile_lock, gem_path, :mode => 0644)
-      if File.exist?(dot_bundle_dir) && File.directory?(dot_bundle_dir)
-        FileUtils.cp_r(dot_bundle_dir, gem_path)
-        FileUtils.chmod_R("ugo+rX", File.join(gem_path, ".bundle"))
+    def gemfile_path
+      "#{app_dir}/Gemfile"
+    end
+
+    def safe_resolve_local_gem(s)
+      Gem::Specification.find_by_name(s.name, s.version)
+    rescue Gem::MissingSpecError
+      nil
+    end
+
+    def requirement_to_str(req)
+      req.as_list.map { |r| "\"#{r}\"" }.join(", ")
+    end
+
+    def requested_dependencies(without)
+      Bundler.settings.temporary(without: without) do
+        definition = Bundler::Definition.build(gemfile_path, gemfile_lock, nil)
+        definition.send(:requested_dependencies)
+      end
+    end
+
+    # This is a blatant ChefDK 2.0 hack.  We need to audit all of our Gemfiles, make sure
+    # that github_changelog_generator is in its own group and exclude that group from all
+    # of our appbundle calls.  But to ship ChefDK 2.0 we just do this.
+    SHITLIST = [
+      "github_changelog_generator",
+    ]
+
+    def external_lockfile?
+      app_dir != File.dirname(gemfile_lock)
+    end
+
+    def local_gemfile_lock_specs
+      gemfile_lock_specs.map do |s|
+        #if SHITLIST.include?(s.name)
+        #  nil
+        #else
+          safe_resolve_local_gem(s)
+        #end
+      end.compact
+    end
+
+    def write_merged_lockfiles(without: [])
+      # just return we don't have an external lockfile
+      return unless external_lockfile?
+
+      # handle external lockfile
+      Tempfile.open(".appbundler-gemfile", app_dir) do |t|
+        t.puts "source 'https://rubygems.org'"
+
+        locked_gems = {}
+
+        gemfile_lock_specs.each do |s|
+          #next if SHITLIST.include?(s.name)
+          spec = safe_resolve_local_gem(s)
+          next if spec.nil?
+
+          case s.source
+          when Bundler::Source::Path
+            locked_gems[spec.name] = %Q{gem "#{spec.name}", path: "#{spec.gem_dir}"}
+          when Bundler::Source::Rubygems
+            # FIXME: should add the spec.version as a gem requirement below
+            locked_gems[spec.name] = %Q{gem "#{spec.name}", "= #{spec.version}"}
+          when Bundler::Source::Git
+            raise "FIXME: appbundler needs a patch to support Git gems"
+          else
+            raise "appbundler doens't know this source type"
+          end
+        end
+
+        seen_gems = {}
+
+        t.puts "# GEMS FROM GEMFILE:"
+
+        requested_dependencies(without).each do |dep|
+          next if SHITLIST.include?(dep.name)
+          if locked_gems[dep.name]
+            t.puts locked_gems[dep.name]
+          else
+            string = %Q{gem "#{dep.name}", #{requirement_to_str(dep.requirement)}}
+            string << %Q{, platform: #{dep.platforms}} unless dep.platforms.empty?
+            t.puts string
+          end
+          seen_gems[dep.name] = true
+        end
+
+        t.puts "# GEMS FROM LOCKFILE: "
+
+        locked_gems.each do |name, line|
+          next if SHITLIST.include?(name)
+          next if seen_gems[name]
+          t.puts line
+        end
+
+        t.close
+        puts IO.read(t.path)  # debugging
+        Dir.chdir(app_dir) do
+          FileUtils.rm_f "#{app_dir}/Gemfile.lock"
+          Bundler.with_clean_env do
+            so = Mixlib::ShellOut.new("bundle lock", env: { "BUNDLE_GEMFILE" => t.path })
+            so.run_command
+            so.error!
+          end
+        end
       end
+      return "#{app_dir}/Gemfile.lock"
     end
 
     def write_executable_stubs
@@ -152,7 +249,11 @@ E
     end
 
     def runtime_dep_specs
-      add_dependencies_from(app_spec)
+      if external_lockfile?
+        local_gemfile_lock_specs
+      else
+        add_dependencies_from(app_spec)
+      end
     end
 
     def app_dependency_names
@@ -167,6 +268,10 @@ E
       spec_for(name)
     end
 
+    def app_dir
+      app_gemspec.gem_dir
+    end
+
     def gemfile_lock_specs
       parsed_gemfile_lock.specs
     end

data/lib/appbundler/cli.rb

@@ -20,6 +20,13 @@ Your bundled application must already be gem installed.  Generated binstubs
 will point to the gem, not your working copy.
 BANNER
 
+    # this is used by chef-dk, its probably not an external API, here be dragons
+    option :without,
+      :long => "--without GROUPS",
+      :description => "Comma separated list of groups to exclude when building transitive Gemfile.locks (internal API)",
+      :proc => lambda { |o| o.split(/[\s,]+/) },
+      :default => []
+
     option :version,
       :short => "-v",
       :long => "--version",
@@ -123,7 +130,8 @@ BANNER
         created_stubs.each do |real_executable_path, stub_path|
           $stdout.puts "Generated binstub #{stub_path} => #{real_executable_path}"
         end
-        app.copy_bundler_env
+        created_lockfile = app.write_merged_lockfiles(without: config[:without])
+        $stdout.puts "Generated merged lockfile at #{created_lockfile}" if created_lockfile
       end
     end
 

data/lib/appbundler/version.rb

@@ -1,3 +1,3 @@
 module Appbundler
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundler
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Dan DeLeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Extracts a dependency solution from bundler's Gemfile.lock to speed gem activation