From b757dbe524fcb6f1604a97fef0bef946566aedde Mon Sep 17 00:00:00 2001
From: Andy Maleh <andy.am@gmail.com>
Date: Tue, 2 Jun 2020 06:58:31 -0400
Subject: [PATCH 1/3] Fixed dependency on test_construct

---
 features/support/env.rb | 2 +-
 test/test_helper.rb     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index 9ba6bf0b..c888fc06 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -17,7 +17,7 @@
 require 'test/unit/assertions'
 World(Test::Unit::Assertions)
 
-require 'construct'
+require 'test_construct'
 World(Construct::Helpers)
 
 def yank_task_info(content, task)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 10c6501f..9df88510 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -18,7 +18,7 @@
 require 'rake'
 require 'shoulda'
 #require 'redgreen'
-require 'construct'
+require 'test_construct'
 require 'git'
 require 'time'
 
@@ -39,7 +39,7 @@ def initialize
 end
 
 class Test::Unit::TestCase
-  include Construct::Helpers
+  include TestConstruct::Helpers
 
   def tmp_dir
     TMP_DIR

From cc0141caaa5f8788bfe7c2c1f016cce808f37376 Mon Sep 17 00:00:00 2001
From: Andy Maleh <andy.am@gmail.com>
Date: Tue, 2 Jun 2020 06:58:57 -0400
Subject: [PATCH 2/3] Fixed broken test for generator constant_name

---
 lib/juwelier/generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/juwelier/generator.rb b/lib/juwelier/generator.rb
index 6b6a33cb..428465c9 100644
--- a/lib/juwelier/generator.rb
+++ b/lib/juwelier/generator.rb
@@ -154,7 +154,7 @@ def run
     end
 
     def constant_name
-      self.project_name.camel
+      self.project_name.underscore.camel
     end
 
     def extension_name

From c6ad56dc7022bc4228221675a372a80a153586f8 Mon Sep 17 00:00:00 2001
From: Andy Maleh <andy.am@gmail.com>
Date: Tue, 2 Jun 2020 07:02:22 -0400
Subject: [PATCH 3/3] Updated generator bundler dependency to >= 1.0

---
 features/support/env.rb   | 2 +-
 lib/juwelier/generator.rb | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index c888fc06..9ba6bf0b 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -17,7 +17,7 @@
 require 'test/unit/assertions'
 World(Test::Unit::Assertions)
 
-require 'test_construct'
+require 'construct'
 World(Construct::Helpers)
 
 def yank_task_info(content, task)
diff --git a/lib/juwelier/generator.rb b/lib/juwelier/generator.rb
index 428465c9..edb358db 100644
--- a/lib/juwelier/generator.rb
+++ b/lib/juwelier/generator.rb
@@ -113,7 +113,7 @@ def initialize(options = {})
 
       development_dependencies << ["cucumber", ">= 0"] if should_use_cucumber
 
-      development_dependencies << ["bundler", "~> 1.0"]
+      development_dependencies << ["bundler", ">= 1.0"]
       development_dependencies << ["juwelier", "~> #{Juwelier::Version::STRING}"]
       development_dependencies << ["simplecov", ">= 0"]
       
@@ -154,7 +154,7 @@ def run
     end
 
     def constant_name
-      self.project_name.underscore.camel
+      self.project_name.snake.camel
     end
 
     def extension_name
@@ -208,7 +208,10 @@ def create_files
 
       output_template_in_target '.gitignore'
       output_template_in_target 'Rakefile'
-      output_template_in_target 'Gemfile' if should_use_bundler
+      if should_use_bundler
+        output_template_in_target 'Gemfile'
+        system 'bundle install'
+      end
       output_template_in_target 'LICENSE.txt'
       output_template_in_target "README.#{use_readme_format}"
       output_template_in_target '.document'