old_sql 0.15.0 → 0.16.0

data/lib/generators/old_sql/install_generator.rb

@@ -14,11 +14,7 @@ Old SQL works with devise. Checking for a current installation of devise!
       app_path.delete_at(-1)
       app_path = app_path.join("/")
       
-      gsub_file app_path+'/db/schema.rb', /users/, :green do |match|
-        puts "User model exists"
-      end
-      
-      puts "User model at #{app_path+'/app/models/user.rb'} exists? #{File.exists?(app_path+'/app/models/user.rb')}"
+      puts "User model exists" unless open(app_path+'/db/schema.rb').grep(/users/).count<=0
 
       if defined?(Devise)
         check_for_devise_models
@@ -61,28 +57,23 @@ Old SQL works with devise. Checking for a current installation of devise!
       app_path.delete_at(-1)
       app_path = app_path.join("/")
       
-      user_found = false
-      
-      gsub_file app_path+'/db/schema.rb', /users/, :green do |match|
-        puts "User model exists"
-        user_found = true
+      if open(app_path+'/db/schema.rb').grep(/users/).count<=0
+        return true
+      else
+        return false
       end
-      
-      user_found
     end
     
     def user_model_has_devise?
-      devise_found = false
-      
       app_path = Rails.public_path.split("/")
       app_path.delete_at(-1)
       app_path = app_path.join("/")
       
-      gsub_file app_path+'/app/models/user.rb', /devise/, :green do |match|
-        puts "User model already has devise"
-        devise_found = true
+      if open(app_path+'/app/models/user.rb').grep(/devise/).count<=0
+        return true
+      else
+        return false
       end
-      devise_found
     end
 
     def parse_route_files

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -142209455033418591
+      hash: -235958455247447896
       segments: 
       - 0
       version: "0"