jimothy 1.0.002 → 1.0.009

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255502c8c568226ce82080916eae0bdb0fb3073fb7372a5f036a34616608c473
-  data.tar.gz: 73529e4e80f39edb1e56ded50686d4e6cd1d73b3f90fafe01aca155b19159f09
+  metadata.gz: a70e66322520a834bb5c9aaf556786e3e66f4755a09366a0f632d4ee3d351d84
+  data.tar.gz: bbdb79e3e76580d55cc2e77babcd8d470f84a08d04d4c3ea78cd02b96b94ae52
 SHA512:
-  metadata.gz: 0ad498d87ab805b1a66398df1390983da77558a0339ea0753ed731601051dfd2c5459f2b3faa095987dca41e509af8b2e17225d7a9140345c5afd2aeb62a66ab
-  data.tar.gz: d9c4a066276e6ac01016030e4612645540a3583fe77500c698200e5150dca47d581237ffd7fe102986bc4da42d02583275d5b29332950ac046370a83d2a1d04b
+  metadata.gz: 89298bf266deb16420fb28cac27f11aebd0a3f9c88518d2de0c75fc19f35bb20e59c7335605511ffbb376d9a52d9bedf0ec096ea3062425fdeae385fea4e3893
+  data.tar.gz: 124537a7e4e05ca4bf7ba3e4b08aa2eed49fe0f6a391fa968b0d624f15acd27ccc262b794c68b3502b2a44c5872d169b23d3b145fa2bd2decf6906a51cf601ce

data/README.md

@@ -14,6 +14,7 @@ This is a (much) less robust version of something like Faker (https://github.com
 
 ## Usage (Quick, Using Custom Generator)
 - (If you don't have an app already) Run `rails new testapp`
+- Do `cd testapp`
 - Add `gem "jimothy"` to your `Gemfile`
 - Run `bundle install`
 - Run `rails g jimothy:install`
@@ -24,6 +25,7 @@ This is a (much) less robust version of something like Faker (https://github.com
 
 ## Usage (Slow, Doing Everything By Hand)
 - (If you don't have an app already) Run `rails new testapp`
+- Do `cd testapp`
 - Add `gem "jimothy"` to your `Gemfile`
 - Run `bundle install`
 - You'll need a `User` model with `name`, `email` and `image` fields (all `string`s). Fastest way to do this is:

data/lib/generators/jimothy/install_generator.rb

@@ -4,21 +4,30 @@ require "rails/generators/rails/resource/resource_generator"
 module Jimothy
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      def scaffold_users
-        %x(rails g scaffold user name email image)
-        %x(rails db:migrate)
-      end
-      def add_image_tag
-        gsub_file 'app/views/users/_user.html.erb',/<%= user.image %>/,'<%= image_tag user.image %>'
-      end
-      def empty_seed_file
-        gsub_file 'db/seeds.rb',/# This file should contain all the record creation needed to seed the database with its default values.\n# The data can then be loaded with the bin\/rails db:seed command \(or created alongside the database with db:setup\).\n#\n# Examples:\n#\n#   movies = Movie.create\(\[\{ name: \"Star Wars\" \}, \{ name: \"Lord of the Rings\" \}\]\)\n#   Character.create\(name: \"Luke\", movie: movies.first\)\n/,'.'
-      end
-      def add_jimothy_call
-        gsub_file 'db/seeds.rb',/./,"require \"jimothy\"\nJimothy::seed_users"
-      end
-      def seed_users
-        %x(rails db:seed)
+      def install_jimothy
+        # only run if User model doesn't exist yet
+        if !Dir[Rails.root + 'app/models/*.rb'].map { |path| path.split('/')[-1] }.include? 'user.rb'
+          # scaffold users
+          %x(rails g scaffold user name email image)
+          %x(rails db:migrate)
+        
+          # add image tag
+          gsub_file 'app/views/users/_user.html.erb',/<%= user.image %>/,'<%= image_tag user.image %>'
+        
+          # empty seed file
+          gsub_file 'db/seeds.rb',/# This file should contain all the record creation needed to seed the database with its default values.\n# The data can then be loaded with the bin\/rails db:seed command \(or created alongside the database with db:setup\).\n#\n# Examples:\n#\n#   movies = Movie.create\(\[\{ name: \"Star Wars\" \}, \{ name: \"Lord of the Rings\" \}\]\)\n#   Character.create\(name: \"Luke\", movie: movies.first\)\n/,'.'
+        
+          # add jimothy call
+          seeds_file = File.read('db/seeds.rb')
+          if seeds_file == '.' # only paste in this Jimothy::seed_users if the previous empty_seed_file was successful (ie, don't add it again if it's already there)
+            gsub_file 'db/seeds.rb',/./,"require \"jimothy\"\nJimothy::seed_users"
+          end
+        
+          # seed_users
+          %x(rails db:seed)
+        else 
+          puts "Error: user model already exists. Skipping jimothy install."
+        end
       end
     end
   end

data/lib/jimothy/version.rb

@@ -1,3 +1,3 @@
 module Jimothy
-  VERSION = "1.0.002"
+  VERSION = "1.0.009"
 end

data/lib/jimothy.rb

@@ -33,7 +33,7 @@ module Jimothy
   end
 
   def self.import_images
-    images = Dir["#{GEM_IMAGE_PATH}" + "*.png"]
+    images = Dir["#{GEM_IMAGE_PATH}" + "*.png"] # TODO: there are jpgs in this folder for the readme, move them to a different folder
     images.each do |path|
       image = path.split('/')[-1]
       source = "#{GEM_IMAGE_PATH}" + image 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimothy
 version: !ruby/object:Gem::Version
-  version: 1.0.002
+  version: 1.0.009
 platform: ruby
 authors:
 - Mark McDermott