bard 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9076d89e08beaf2ad82288df2d011e7877fd428c3494017bdf8ab85f6930420a
-  data.tar.gz: 6145accad41a735c5a4d15487ec060ff438eecdeadeaa33ba31f5b6c39e5b1fd
+  metadata.gz: ecd823956fef238023d672971dd80049518eb8f3408383132db92077ddabe957
+  data.tar.gz: 6a69bcac5891b545fabec4009b7b84148a1448fe62567813e8377e963791099a
 SHA512:
-  metadata.gz: 836672f605166d44daf52dbc274c6fa30518605414cd743e7902119648cfc2ec2b5fee629d0d4f069e8830f867652ff3aca6585c5b481b7cd53f3c7a83d7da21
-  data.tar.gz: 3c6b84ef4db712f94137b589fd3a45fd2063d50cee5872b64164648330929951197c25cb074d743698cbef20b7b7f0b37ea6f4388c9a4d8aa72ae3b821b69ac3
+  metadata.gz: 4ea3c080d440a8cd560f713951f9ec5052a89cb9b1dfc0194f02e49f13623c8292379fcc47f6e90d3f1971c9b37e9a33a15e0f357d88a2428e11bd0af202bbc4
+  data.tar.gz: cda529a9823733f871fb8f2274c39790e69b142317f016168643e908e75c8551b11437e8fa478b84cec84584331951d8c5c79a3935ced531f2154b556e4700c8

data/lib/bard/cli/new.rb

@@ -27,20 +27,47 @@ class Bard::CLI::New < Bard::CLI::Command
   end
 
   def create_project
-    run! <<~SH
+    run! build_create_project_script
+  end
+
+  def build_create_project_script
+    build_bash_env do
+      build_rvm_setup +
+      build_gem_install("rails", RAILS_REQUIREMENT) +
+      build_rails_new
+    end
+  end
+
+  def build_bash_env
+    script = yield
+    <<~SH
       env -i bash -lc '
         export HOME=~
-        cd ..
         source ~/.rvm/scripts/rvm
-        rvm use --create #{ruby_version}@#{project_name}
-
-        gem install rails -v "#{RAILS_REQUIREMENT}" --no-document
-        RAILS_VERSION=$(ruby -e "spec = Gem::Specification.find_by_name 'rails', '#{RAILS_REQUIREMENT}'; puts spec.version")
-        rails _${RAILS_VERSION}_ new #{project_name} --skip-git --skip-kamal --skip-test -m #{template_path}
+        #{script}
       '
     SH
   end
 
+  def build_rvm_setup
+    <<~SH
+      cd ..
+      rvm use --create #{ruby_version}@#{project_name}
+    SH
+  end
+
+  def build_gem_install(gem_name, version_requirement)
+    <<~SH
+      GEM_VERSION=$(gem install #{gem_name} -v \"#{version_requirement}\" --no-document 2>&1 | grep -oP \"Successfully installed #{gem_name}-\\K[0-9.]+\")
+    SH
+  end
+
+  def build_rails_new
+    <<~SH
+      rails _${GEM_VERSION}_ new #{project_name} --skip-git --skip-kamal --skip-test -m #{template_path}
+    SH
+  end
+
   def push_to_github
     api = Bard::Github.new(project_name)
     api.create_repo

data/lib/bard/cli/new_rails_template.rb

@@ -1,5 +1,5 @@
 ruby_version, project_name = (`rvm current name`.chomp).split("@")
-rails_version = Gem.loaded_specs["rails"].version
+rails_version = Gem.loaded_specs["railties"].version
 
 file ".ruby-version", ruby_version
 file ".ruby-gemset", project_name

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.5.2"
+  VERSION = "1.5.4"
 end
 

data/spec/bard/cli/new_spec.rb

@@ -57,4 +57,17 @@ describe Bard::CLI::New do
       expect(new_cli.send(:template_path)).to match(/new_rails_template\.rb$/)
     end
   end
-end
+
+  describe "#install_and_extract_version" do
+    it "correctly installs a gem and extracts its version" do
+      cmd = new_cli.send :build_bash_env do
+        <<~SH
+          #{new_cli.send(:build_gem_install, "bundler", "~> 2.0")}
+          echo ${GEM_VERSION}
+        SH
+      end
+      result = `#{cmd}`.strip
+      expect(result).to match(/^2\.\d+\.\d+/)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Micah Geisel