utopia 2.12.2 → 2.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129fb06326aaa89c24f188c0cf3536a137585ddfef162c6f64813cf5d100cd8b
-  data.tar.gz: acf2e43d22dd058cdbaae60daa0b31bd69c4871844c706d620feb6ee78352729
+  metadata.gz: 853a7f6ab2d11164d3c7191c5ae6dc40a2985f81a5764122c34811398fcf646e
+  data.tar.gz: bce9b1b6f97a446dfc5005b40f8da315c4e1c63a7e3a5e1d05508f0019fad133
 SHA512:
-  metadata.gz: a858a673236d42e12fca43a8d565c0104687e870dcd15aa3a568a3c5b10c60ec836770ab52d3be0b569271eb38bd2c6a37c622dbceaea7f0171e90c7cd04cc2a
-  data.tar.gz: ebb9201ffe8ebdd794fa4828a20c05206d4eee4b4563cf88cac345f405dae33fdd670c1aaf28205ffe5d83b54f71b14ebb2fc7a14bf1d43ef94c03e581feb7cc
+  metadata.gz: 1cf1263a2eea5de9d68e9ac27c9a61f44f5cb648a2be3671a359da7e9b1845a955ad5af18964189ca9bb69e1ec5061840e0c86d742376ceef49236fea7b22600
+  data.tar.gz: 1c1f5c82dc7f4755934955f4db0dbd2f379edf9afdf7632c94337d083b0a72564e11c0f30a5a955579d722cd22441e0a5500f73fc35fc1b1ca40958dde77c4bb

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 
 before_install:
+  - gem install bundler
   # Install all dependencies:
   - gem install utopia
   # For testing purposes:

data/Rakefile

@@ -12,7 +12,7 @@ namespace :documentation do
 
 	desc "Build and run the documentation wiki."
 	task :server => :yard do
-		Bundler.with_clean_env do
+		Bundler.with_unbundled_env do
 			Dir.chdir('documentation') do
 				sh('bundle', 'install', '--quiet')
 				sh('bundle', 'exec', 'rake')

data/lib/utopia/command/server.rb

@@ -68,6 +68,9 @@ module Utopia
 						system("git", "config", "receive.denyCurrentBranch", "ignore") or fail "could not set configuration"
 						system("git", "config", "core.worktree", destination_root) or fail "could not set configuration"
 						
+						system("bundle", "config", "set", "--local", "deployment", "true")
+						system("bundle", "config", "set", "--local", "without", "development test")
+						
 						# In theory, to convert from non-shared to shared:
 						# chgrp -R <group-name> .                   # Change files and directories' group
 						# chmod -R g+w .                            # Change permissions

data/lib/utopia/command/site.rb

@@ -83,7 +83,7 @@ module Utopia
 						
 						if `which bundle`.strip != ''
 							puts "Generating initial package list with bundle..."
-							system("bundle", "install", "--binstubs") or fail "could not install bundled gems"
+							system("bundle", "install") or fail "could not install bundled gems"
 						end
 						
 						if `which git`.strip == ""

data/lib/utopia/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.12.2"
+	VERSION = "2.12.3"
 end

data/setup/server/git/hooks/post-receive

@@ -63,7 +63,7 @@ Dir.chdir(GIT_WORK_TREE) do
 	sudo %W{git submodule update -i}
 	
 	if File.exist? 'Gemfile'
-		sudo %W{bundle install --deployment --jobs=4 --retry=2 --quiet}
+		sudo %W{bundle install --jobs=4 --retry=2}
 	end
 	
 	if File.exist? 'Rakefile'

data/spec/utopia/command_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe "utopia command" do
 	end
 	
 	around(:each) do |example|
-		Bundler.with_clean_env do
+		Bundler.with_unbundled_env do
 			# If we don't delete this, when running on travis, it will try submit the coverage report.
 			ENV.delete('COVERAGE')
 			

data/utopia.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'async-websocket'
 	
 	spec.add_development_dependency 'covered'
-	spec.add_development_dependency 'bundler'
+	spec.add_development_dependency 'bundler', '~> 2.1'
 	spec.add_development_dependency 'rspec', '~> 3.6'
 	spec.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.12.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -196,16 +196,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement