octopress 3.0.3.alpha.0 → 3.0.3.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3f0c18808c7ec945168fa9b80c08aaa9c361df
-  data.tar.gz: 1637c8a31fbfb198ebe11e9c53283b985951693f
+  metadata.gz: edd34d6b0115fb7d985fc400cacebdcd8d69bc5d
+  data.tar.gz: c49c55abbadf9769f01e0397c83072369c041c71
 SHA512:
-  metadata.gz: d52ec8c94b554272c30b82b119b89b9453ee174f2415de4e83e74c16e8c61656615b90a55952272dcedc24841b5b4489e50b4fe4de18e1f3f3a0d5e9a9d96764
-  data.tar.gz: 19bdaf25ac47b6ab488fe7e08b850b7e91c67a72959f708fe0e47b3afa58003e7b90cd9e8f37f3bca76336928fe31afd227ac2f7484ca1af1007764abff66fb1
+  metadata.gz: 15bf1a0529dec213d4b33f4cf3e107e893296c9ac336b4b183cf9c289b131f65f786593df4c47679107dedcc0c4f96e996542e1029d1b70f81c6902ecc56ec9f
+  data.tar.gz: 719465356587779ee8c888e94f22614efacfd95f39b7cf8cef627d7b229e8d0513b80bb8eced616d0140fd64337aed174134910477b18048b5c8fb74fd5b95d5

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.3.alpha.0"
+  VERSION = "3.0.3.alpha.1"
 end

data/lib/octopress.rb

@@ -101,16 +101,18 @@ module Octopress
   end
 
   def self.require_gems
-    if !ENV["CLASH_NO_BUNDLER_REQUIRE"] && (File.file?("Gemfile") || File.file?("../Gemfile"))
-      require "bundler"
-      Bundler.setup # puts all groups on the load path
-      Bundler.require(:octopress)
-      true
+    if !ENV["OCTOPRESS_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
+      begin
+        require "bundler"
+        Bundler.setup # puts all groups on the load path
+        Bundler.require(:octopress)
+        true
+      rescue LoadError, Bundler::GemfileNotFound
+        false
+      end
     else
       false
     end
-    rescue LoadError, Bundler::GemfileNotFound
-    false
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.3.alpha.0
+  version: 3.0.3.alpha.1
 platform: ruby
 authors:
 - Brandon Mathis