lam 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816d582bb2efa679feebdd2cbff48d276f4d3ed6
-  data.tar.gz: 023a055c5c5565ca00c6533fcfd8ec6857da300b
+  metadata.gz: 239112ad06f44a6ef1c2fcf544caecce49cfd125
+  data.tar.gz: 708dd09be324c075644686bd90d255bd4ea1b026
 SHA512:
-  metadata.gz: ca24b7941f7ce3a6664d1db1b92fb4a8de478ae095c2371a6f88b3c77e76a6ea5217c781eed2854e5be454006d76cc02e1421bbfc3874f6a50b3dca4e36d8a96
-  data.tar.gz: 50b794a91cfdeb6d48d3fb146c03b2c8565958b609e66fb8d2d6b74b143323b937ae951d8a86540eea02ce9b0ad87c5ccd86a6d94787afad54bcfd8af8220cd4
+  metadata.gz: 893dcbd2e8ddc28f0f51c4ea3f6c44d241f898dc405ac9a1523bda20d8b6d75a08b9de08f6b8e3671cc1859b7189958d22930fdc9a438e9cbaa371a0b49eb3cb
+  data.tar.gz: c76663f7468bc9029dffc7cd20ab22779a9bba3aec8c2e63e6776a7cf1b9c8adb1d9613ad30cb472df6e3fe2e94d0876d0d34452527dfd558cd6402e3d8404ea

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
+
+## [0.1.2]
+- Fix bundled gems.

data/lib/lam/build/traveling_ruby.rb

@@ -23,6 +23,7 @@ class Lam::Build
         download_traveling_ruby
         unpack_traveling_ruby
         bundle_install
+        vendor_gemfiles
       end
 
       move_bundled_to_project
@@ -84,6 +85,26 @@ class Lam::Build
       puts 'Bundle install success.'
     end
 
+    # The wrapper script doesnt work unless you move the gem files in the
+    # bundled/gems folder and export it to BUNDLE_GEMFILE in the
+    # wrapper script.
+    def vendor_gemfiles
+      puts "Moving gemfiles into #{bundled_gems_dest}/"
+      FileUtils.mv("Gemfile", "#{bundled_gems_dest}/")
+      FileUtils.mv("Gemfile.lock", "#{bundled_gems_dest}/")
+
+      bundle_config_path = "#{bundled_gems_dest}/.bundle/config"
+      puts "Generating #{bundle_config_path}"
+      FileUtils.mkdir_p(File.dirname(bundle_config_path))
+      bundle_config =<<-EOL
+BUNDLE_PATH: .
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'
+EOL
+      IO.write(bundle_config_path, bundle_config)
+
+    end
+
     def move_bundled_to_project
       if File.exist?("#{Lam.root}bundled")
         puts "Removing current bundled folder"
@@ -97,6 +118,10 @@ class Lam::Build
       "bundled/ruby"
     end
 
+    def bundled_gems_dest
+      "bundled/gems"
+    end
+
     def traveling_ruby_url
       TRAVELING_RUBY_VERSION
     end

data/lib/lam/version.rb

@@ -1,3 +1,3 @@
 module Lam
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/fixtures/project/Gemfile.lock

@@ -1,12 +1,3 @@
-PATH
-  remote: /Users/tung/src/tongueroo/lam
-  specs:
-    lam (0.0.1)
-      activesupport
-      colorize
-      hashie
-      thor
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -20,6 +11,11 @@ GEM
     hashie (3.5.6)
     i18n (0.9.0)
       concurrent-ruby (~> 1.0)
+    lam (0.1.1)
+      activesupport
+      colorize
+      hashie
+      thor
     minitest (5.10.3)
     print_ruby_info (0.0.3)
     thor (0.20.0)
@@ -31,5 +27,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  lam!
+  lam
   print_ruby_info

data/spec/fixtures/project/bin/lam

@@ -8,7 +8,7 @@ PROJECTDIR="`cd \"$PROJECTDIR/..\" && pwd`"
 
 # Tell Bundler where the Gemfile and gems are.
 # IMPORTANT: the Gemfile must be in the same bundled/gems folder
-export BUNDLE_GEMFILE="$PROJECTDIR/Gemfile"
+export BUNDLE_GEMFILE="$PROJECTDIR/bundled/gems/Gemfile"
 unset BUNDLE_IGNORE_CONFIG
 
 # Run the actual app using the bundled Ruby interpreter, with Bundler activated.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lam
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tung Nguyen
@@ -162,6 +162,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile