generic_app 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca7ea6c3349e9a632cdab668af506b8708c4698
-  data.tar.gz: c4a3f742010b74f8a27bf40217f6b1c3357fa9fb
+  metadata.gz: d7fd06aa9d58922cf9688ac51c18a3ff980f1537
+  data.tar.gz: 0b0edbb493e11eb6a79626b29364820dc5ccd65e
 SHA512:
-  metadata.gz: 5f37dad81ea4fd0c9a0d945e8c72d61ff63ac556a3331ee2378d5b070ec90c1eec09301830fb1d488fc281899671b0057e07414acff09719119f05d39cda5116
-  data.tar.gz: b255a4dc2cf177b3114e5cba334fd61e98b0908fe0c2193d74df354acecb0189c3b6a38f8b0d866fc075cde334d388a0ea544373d28a86031f7d919af002424e
+  metadata.gz: a2ac976717b13c130e9f71e44b8c935b22faf809c45d0ebc38b2270759b4141db1621c87dc21a8a7defc7396775ffe700b5972e70b5a119167d2eb89f8ad99d1
+  data.tar.gz: beb6a7580d359f3bdb7e599af04b18975905b30ac04390965699956d8cd68a694032583454c3542c4343aae823dccd97880bbf5ac44f516b793fb362104f5c0d

data/.codeclimate.yml

@@ -0,0 +1,8 @@
+# Save as .codeclimate.yml (note leading .) in project root directory
+languages:
+  Ruby: true
+  JavaScript: true
+  PHP: true
+  Python: true
+# exclude_paths:
+# - "foo/bar.rb"

data/gem_test.sh

@@ -14,30 +14,40 @@ echo "BEGIN TESTING generic_app"
 rake 2>&1 | tee $DIR_GENERIC_APP/log/generic_app.txt
 echo "FINISHED TESTING generic_app"
 echo "****************************"
-
-echo '************'
-echo 'BEGIN TEST 1'
+echo ''
+echo '*************'
+echo 'BEGIN TEST 1A'
 echo 'Creating new Rails app'
-
-cd $DIR_PARENT/tmp1 && sh test_app.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp1.txt 
-echo 'FINISHED TEST 1'
+cd $DIR_PARENT/tmp1 && sh test_app.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp1A.txt 
+echo 'FINISHED TEST1A'
 echo '***************'
-
-echo '************'
-echo 'BEGIN TEST 2'
+echo ''
+echo '*************'
+echo 'BEGIN TEST 1B'
+echo 'Creating new Rails app'
+cd $DIR_PARENT/tmp1 && sh test_code.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp1B.txt 
+echo 'FINISHED TEST 1B'
+echo '****************'
+echo ''
+echo '*************'
+echo 'BEGIN TEST 2A'
 echo 'Adding Generic App features to legacy Rails app'
-
-cd $DIR_PARENT/tmp2 && sh test_app.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp2.txt 
-echo 'FINISHED TEST 2'
-echo '***************'
-
-
+cd $DIR_PARENT/tmp2 && sh test_app.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp2A.txt
+echo 'FINISHED TEST 2A'
+echo '****************'
+echo ''
+echo '*************'
+echo 'BEGIN TEST 2B'
+cd $DIR_PARENT/tmp2 && sh test_code.sh 2>&1 | tee $DIR_GENERIC_APP/log/tmp2B.txt
+echo 'FINISHED TEST 2B'
+echo '****************'
 
 echo
 echo '***********************************'
 echo 'The locations of the test logs are:'
-echo "TEST 1 (new app): $DIR_GENERIC_APP/tmp1.txt"
-echo "TEST 2 (legacy app): $DIR_GENERIC_APP/tmp2.txt"
+echo "GEM TEST: $DIR_GENERIC_APP/log/generic_app.txt"
+echo "TEST 1 (new app): $DIR_GENERIC_APP/log/tmp1.txt"
+echo "TEST 2 (legacy app): $DIR_GENERIC_APP/log/tmp2.txt"
 echo
 echo "If all went well, the results at the end of each test show 0 or 31m0 failures and 0 errors."
 echo

data/lib/generic_app/version.rb

@@ -1,3 +1,3 @@
 module GenericApp
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/generic_app.rb

@@ -45,23 +45,56 @@ module GenericApp
   end
 
   def self.add (subdir_name)
-    self.update_gitignore(subdir_name, 'tmp*')
-    self.update_gitignore(subdir_name, '.DS_Store')
+    self.add_to_file_if("#{subdir_name}/.gitignore", 'tmp*')
+    self.add_to_file_if("#{subdir_name}/.gitignore", '.DS_Store')
+    self.add_to_file_if("#{subdir_name}/.gitignore", 'notes/*.dot')
+    self.add_to_file_if("#{subdir_name}/.gitignore", 'notes/*.svg')
+    self.add_to_file_if("#{subdir_name}/.gitignore", 'gemsurance_report.html')
+    path_gemfile = "#{subdir_name}/Gemfile"
+    self.add_to_file_always(path_gemfile, '# Gems added by generic_app')
+    self.add_to_file_always(path_gemfile, 'group :development, :test do')
+    
+    self.add_to_file_if(path_gemfile, "gem 'sandi_meter'")
+    StringInFile.replace("gem 'sandi_meter'", "  gem 'sandi_meter'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'brakeman'")
+    StringInFile.replace("gem 'brakeman'", "  gem 'brakeman'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'bundler-audit'")
+    StringInFile.replace("gem 'bundler-audit'", "  gem 'bundler-audit'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'rails-erd'")
+    StringInFile.replace("gem 'rails-erd'", "  gem 'rails-erd'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'railroady'")
+    StringInFile.replace("gem 'railroady'", "  gem 'railroady'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'annotate'")
+    StringInFile.replace("gem 'annotate'", "  gem 'annotate'", path_gemfile)
+    self.add_to_file_if(path_gemfile, "gem 'gemsurance'")
+    StringInFile.replace("gem 'gemsurance'", "  gem 'gemsurance'", path_gemfile)
+    
+    self.add_to_file_always(path_gemfile, 'end')
+    
     self.copy_scripts (subdir_name)
+    LineContaining.delete('***', "#{subdir_name}/test_code.sh")
+    LineContaining.delete('rubocop', "#{subdir_name}/test_code.sh")
+    LineContaining.delete('rails_best_practices', "#{subdir_name}/test_code.sh")
+    LineContaining.delete('metric_fu', "#{subdir_name}/test_code.sh")
+  end
+  
+  def self.add_to_file_always (filename, str)
+    puts '------------------------------------'
+    puts "Updating #{filename} (adding #{str})"
+    text_from_file = File.read(filename)
+    last_char = text_from_file[-1]
+    open(filename, 'a') { |f|
+      if last_char != "\n"
+        f.puts "\n"
+      end
+      f.puts "\n#{str}"
+    }
   end
 
-  def self.update_gitignore (subdir_name, str)
-    puts '-----------------------------------'
-    puts "Updating .gitignore (adding #{str})"
-    if StringInFile.present(str, "#{subdir_name}/.gitignore") == false
-      text_from_file = File.read("#{subdir_name}/.gitignore")
-      last_char = text_from_file[-1]
-      open("#{subdir_name}/.gitignore", 'a') { |f|
-        if last_char != "\n"
-          f.puts "\n"
-        end
-        f.puts "\n#{str}"
-      }
+  # Add to file if not already present
+  def self.add_to_file_if (filename, str)
+    if StringInFile.present(str, filename) == false
+      self.add_to_file_always(filename, str)
     end
   end
 

data/spec/lib/1_new_app_spec.rb

@@ -42,19 +42,32 @@ describe GenericApp do
     expect(StringInFile.present("tmp", "#{dir_app_1}/.gitignore")).to eq(true)
     expect(StringInFile.present("tmp*", "#{dir_app_1}/.gitignore")).to eq(true)
     expect(StringInFile.present(".DS_Store", "#{dir_app_1}/.gitignore")).to eq(true)
+    expect(StringInFile.present("notes/*.dot", "#{dir_app_1}/.gitignore")).to eq(true)
+    expect(StringInFile.present("notes/*.svg", "#{dir_app_1}/.gitignore")).to eq(true)
+    expect(StringInFile.present("gemsurance_report.html", "#{dir_app_1}/.gitignore")).to eq(true)
   end
-  
-  it "The notes/1-file_list.txt file should be in place" do
-    expect(StringInFile.present("app/models", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/views", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/controllers", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
+
+  it "The notes/1-file_list-controllers.txt file should be in place" do
+    expect(StringInFile.present("users_controller_test.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("users_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("confirmations_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("omniauth_callbacks_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("passwords_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("registrations_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("sessions_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+    expect(StringInFile.present("unlocks_controller.rb", "#{dir_app_1}/notes/1-file_list-controllers.txt")).to eq(true)
+  end
+
+  it "The notes/1-file_list-misc.txt file should be in place" do
+    expect(StringInFile.present("application_helper.rb", "#{dir_app_1}/notes/1-file_list-misc.txt")).to eq(true)
+    expect(StringInFile.present("users_helper.rb", "#{dir_app_1}/notes/1-file_list-misc.txt")).to eq(true)
   end
   
-  it "The notes/mvc-users.txt file should be in place" do
-    expect(StringInFile.present("users_controller.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("users_controller_test.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("users_helper.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("def index", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("def show", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+  it "The notes/1-file_list-models.txt file should be in place" do
+    expect(StringInFile.present("admin_test.rb", "#{dir_app_1}/notes/1-file_list-models.txt")).to eq(true)
+    expect(StringInFile.present("user_test.rb", "#{dir_app_1}/notes/1-file_list-models.txt")).to eq(true)
+    expect(StringInFile.present("admin.rb", "#{dir_app_1}/notes/1-file_list-models.txt")).to eq(true)
+    expect(StringInFile.present("user.rb", "#{dir_app_1}/notes/1-file_list-models.txt")).to eq(true)
   end
+
 end

data/spec/lib/2_legacy_app_spec.rb

@@ -42,5 +42,25 @@ describe GenericApp do
     expect(StringInFile.present("tmp", "#{dir_app_2}/.gitignore")).to eq(true)
     expect(StringInFile.present("tmp*", "#{dir_app_2}/.gitignore")).to eq(true)
     expect(StringInFile.present(".DS_Store", "#{dir_app_2}/.gitignore")).to eq(true)
+    expect(StringInFile.present("notes/*.dot", "#{dir_app_2}/.gitignore")).to eq(true)
+    expect(StringInFile.present("notes/*.svg", "#{dir_app_2}/.gitignore")).to eq(true)
+    expect(StringInFile.present("gemsurance_report.html", "#{dir_app_2}/.gitignore")).to eq(true)
+  end
+
+  it "The Gemfile includes code checking gems" do
+    expect(StringInFile.present("gem 'sandi_meter'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'brakeman'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'bundler-audit'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'rails-erd'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'railroady'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'annotate'", "#{dir_app_2}/Gemfile")).to eq(true)
+    expect(StringInFile.present("gem 'gemsurance'", "#{dir_app_2}/Gemfile")).to eq(true)
+  end
+  
+  it 'The test_code.sh script excludes certain parts of the original' do
+    expect(StringInFile.present('***', "#{dir_app_2}/test_code.sh")).to eq(false)
+    expect(StringInFile.present('rubocop', "#{dir_app_2}/test_code.sh")).to eq(false)
+    expect(StringInFile.present('rails_best_practices', "#{dir_app_2}/test_code.sh")).to eq(false)
+    expect(StringInFile.present('metric_fu', "#{dir_app_2}/test_code.sh")).to eq(false)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: generic_app
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jason Hsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile