opening_act 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53cdcad2b4e128867547442e613f83aec0815724
-  data.tar.gz: 7ce35c11f8246eaa29188f77caf609699296639c
+  metadata.gz: 0d783f768ba97656f6ced7c890d503f8c93f816c
+  data.tar.gz: b14f23a6cda8fe36364241215f734bfc58350166
 SHA512:
-  metadata.gz: b02b7322ad13caff65143c56b9d7e3e474e1de10f54d9ee3807e075a339c483a9153e69c4adfbda5a0126fd0bc129e1822211181e4388e24e796661c24f1e077
-  data.tar.gz: a6df5b7bc0931e7b2c08f1df656868fecdc668db5355fb6d323822747917fa783186f0c072eb76ab4e1905e7b95956623a49ac452bdcbe3e2c79aa45206ed846
+  metadata.gz: ca1606615e06889b25399d0a6be7dae4e360550bfe9bbeac054940d95613c826756c7d9e6d2c08797c254d3cfa58f8aabfa3a5c6ee18e4ed1d9a011c7cf9c707
+  data.tar.gz: 92d7807243d93c0c42677a7ef11568dabff9bc2643276686b3ae9f7169a7a6ed3d5382034409939636656e029a0e26b643fb640365ce8a72cbc86ab6745bdb1b

data/lib/opening_act/output.rb

@@ -22,7 +22,7 @@ module Outputable
   end
 
   def take_the_stage
-    puts '> The Opening Act has begun to play. This may take a moment.'
+    puts '> The Opening Act has begun to perform. This may take a moment.'
   end
 
   def add_confirmation
@@ -39,9 +39,9 @@ module Outputable
     puts "> Your project has been renamed to '#{template.name}'."
   end
 
-  def new_git_confirmation
-    puts '> Running this command will initiate a git project.'
-    puts "> Make sure you aren't running this inside another git project."
-    puts '> Type QUIT if you wish to stop. Otherwise, click Enter.'
+  def nested_git_confirmation
+    puts '> A git project already exists in this directory.'
+    puts '> Running OpeningAct will create a nested git.'
+    puts '> Type CONTINUE if you wish to continue. Otherwise, press Enter.'
   end
 end

data/lib/opening_act/templates/Gemfile_Spec

@@ -4,8 +4,8 @@ source "https://rubygems.org"
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'erubis'
-gem 'rack'
-gem 'rspec'
+gem 'rake'
+gem 'dotenv'
 
 group :production do
   gem "puma"
@@ -15,3 +15,8 @@ group :development do
   gem 'pry'
   gem 'rubocop'
 end
+
+group :test do
+  gem 'rspec', :require => 'spec'
+  gem 'rack-test'
+end

data/lib/opening_act/templates/Gemfile_Test

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'erubis'
-gem 'rack'
+gem 'rake'
 gem 'minitest'
 gem 'minitest-reporters'
 

data/lib/opening_act/templates/Rakefile_Test

@@ -1,4 +1,3 @@
-require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|

data/lib/opening_act/templates/spec/new_app_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/spec_helper"
+require_relative "#{File.dirname(__FILE__)}/spec_helper"
 
 describe 'main application' do
   include Rack::Test::Methods

data/lib/opening_act/templates/test/test_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-Dir.glob(File.expand_path('../*.rb', __FILE__)).each do |file|
-  require file
+Dir.glob(File.expand_path('../../*.rb', __FILE__)).each do |file|
+  require_relative file
 end
 
 require 'minitest/autorun'

data/lib/opening_act/version.rb

@@ -1,3 +1,3 @@
 class OpeningAct
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/opening_act.rb

@@ -12,7 +12,7 @@ class OpeningAct
   extend Verifiable
 
   def self.perform(name, test_name)
-    return leave_the_stage unless play_on?
+    return leave_the_stage if nested_git? && quit_playing?
 
     setup(name, test_name)
     add_overwrite_rename_or_quit while directory_exists?
@@ -58,16 +58,20 @@ class OpeningAct
     test_type[0] == '-'
   end
 
+  def self.nested_git?
+    File.exists? '.git'
+  end
+
   def self.overwrite_existing_dir
     FileUtils.rm_rf(template.name)
 
     overwrite_confirmation
   end
 
-  def self.play_on?
-    new_git_confirmation
+  def self.quit_playing?
+    nested_git_confirmation
 
-    !%w[quit q].include?(user_input.downcase)
+    user_input.downcase != 'continue'
   end
 
   def self.rename_project

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_act
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sun-Li Beatteay