schema_to_scaffold 0.2.0 → 0.2.1

data/README.md

@@ -12,7 +12,7 @@ SchemaToScaffold will generate rails scaffolding scripts by table like this:
 
 ## Installation ##
 
-We assume you have rubygems-bundler installed, just type:
+Assuming that you have rubygems-bundler installed, just type:
 
     gem install schema_to_scaffold
 
@@ -25,7 +25,8 @@ Just type:
     
 	[options]
     -h				Displays help.
-	-p <path>		It specifies a file ex: -p /path/to/your/schema.rb
+	-p <path>		It specifies a search path or a path to a file 
+					ex: -p /user/path  or  /path/to/your/schema.rb
 	-c				Works only on linux. Will copy the script copied to your clipboard.
 					You will need to have xclip installed(see below).
 

data/bin/scaffold

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 require 'schema_to_scaffold'
-require 'find'
 
 ## Argument conditions
 
@@ -14,17 +13,19 @@ if opts[:help]
 end
 
 ## looking for schema.rb in user directory
-if opts[:path].nil?
+
+unless opts[:path].to_s.match(/\.rb$/)
   paths = SchemaToScaffold::Path.new
-  paths.search
+  paths.search_in opts[:path]
+  path = paths.choose
 end
 
 ## Opening file
+path||=opts[:path]
 begin
-  path = opts[:path] || paths.choose
   data = File.open(path, 'r') {|f| f.read }
 rescue
-  puts "Unable to open file '#{path}'"
+  puts "\nUnable to open file '#{path}'"
   exit 1
 end
 

data/lib/schema_to_scaffold.rb

@@ -14,7 +14,7 @@ module SchemaToScaffold
 Usage: scaffold [options] 
 Generate a rails scaffold script for a given schema.rb
  -h             Displays help.
- -p <path>      It specifies a path to a file
+ -p <path>      It specifies a path to a folder or to a file
 
 END_OF_HELP
 
@@ -24,7 +24,7 @@ END_OF_HELP
   WINDOWS_HELP = <<-WINDOWS_SAMPLE
 Examples:
 scaffold 
-or
+scaffold -p C:\\Users\\JohnDoe
 scaffold -p C:\\Users\\JohnDoe\\Documents\\schema.rb
 WINDOWS_SAMPLE
 
@@ -34,8 +34,8 @@ WINDOWS_SAMPLE
      -c             Works only on linux. Will copy the script copied to your clipboard. You will need to have xclip installed(see below).
 Examples:
 scaffold
-or 
-scaffold -x -p ~/work/rails/my_app/db/schema.rb
+scaffold -c -p ~/work/rails/my_app
+scaffold -c -p ~/work/rails/my_app/db/schema.rb
 LINUX_SAMPLE
 
   def help_msg
@@ -51,12 +51,23 @@ LINUX_SAMPLE
   # Parses ARGV and returns a hash of options.
 
   def parse_arguments(argv)
-    argv.index("-p") ? path = argv[argv.index("-p")+1] : nil
-    {
-      xclip: argv.delete('-c'),        # check for xclip flag
-      help:  argv.delete('-h'),        # check for help flag
-      path:  path         # get path to file(s)
-    }
+    if argv_index = argv.index("-p")
+      path = argv.delete_at(argv_index+1)
+      argv.delete('-p')
+    end
+    args = {
+            xclip: argv.delete('-c'),        # check for xclip flag
+            help:  argv.delete('-h'),        # check for help flag
+            path:  path       # get path to file(s)
+           }
+    unless argv.empty?
+      puts "\n------\nWrong set of arguments.\n------\n" 
+      puts help_msg
+      exit
+    else
+      args
+    end
+
   end
 
   ##

data/lib/schema_to_scaffold/path.rb

@@ -6,16 +6,25 @@ module SchemaToScaffold
   class Path
     
     def initialize
-      @paths = PATH_NAMES.detect {|h| ENV[h] != nil}
+      @search_path = ENV[PATH_NAMES.detect {|h| ENV[h] != nil}]
+    end
+    
+    def check_directory(path)
+      unless File.directory?(path)
+        puts "\nSorry #{path} is not a valid directory!"
+        exit
+      end
+      path
     end
     
     ##
     # Will search for schema.rb in the user directory
-    def search
-      puts 'looking for schema.rb in '+ ENV[@paths]
-      @schema_paths =  Array.new
-      Find.find(ENV[@paths]) do |path|
-        @schema_paths<<path if path[/schema\.rb$/]
+    def search_in(path = nil)
+      @search_path = path.to_s unless path.nil?
+      puts "\nLooking for schema.rb in #{check_directory @search_path}"
+      @schema_paths = Array.new
+      Find.find(@search_path) do |s_p|
+        @schema_paths<<s_p if s_p[/schema\.rb$/]
       end
     end
     
@@ -25,7 +34,7 @@ module SchemaToScaffold
       @schema_paths.each_with_index {|path,i|  puts "#{i}. #{path}" }
       begin
           print "\nSelect a path to the target schema: "
-      end while (id = gets.chomp.to_i).nil?
+      end while @schema_paths[(id = gets.to_i)].nil?
       @schema_paths[id]
     end
     

data/lib/schema_to_scaffold/version.rb

@@ -1,3 +1,3 @@
 module SchemaToScaffold
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/schema_to_scaffold.gemspec

@@ -6,15 +6,17 @@ require 'schema_to_scaffold/version'
 Gem::Specification.new do |gem|
   gem.name          = "schema_to_scaffold"
   gem.version       = SchemaToScaffold::VERSION
-  gem.authors       = ["Humberto Pinto", "João Soares"]
-  gem.email         = ["hlsp999@gmail.com", "jsoaresgeral@gmail.com"]
+  gem.authors       = ["João Soares", "Humberto Pinto"] 
+  gem.email         = ["jsoaresgeral@gmail.com", "hlsp999@gmail.com"] 
   gem.description   = <<-EOD
   Command line app which parses a schema.rb file obtained from your rails repo or by running rake:schema:dump
 EOD
-  gem.summary       = %q{Generate rails scaffold script from a schema.rb file.}
-  gem.homepage      = "http://github.com/frenesim/schema_to_scaffold"
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.summary               = %q{Generate rails scaffold script from a schema.rb file.}
+  gem.homepage              = "http://github.com/frenesim/schema_to_scaffold"
+  gem.bindir                = "bin"
+  gem.files                 = `git ls-files`.split($/)
+  gem.executables           = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.require_paths         = ["lib"]
+  gem.post_install_message  = "Thanks for installing!"
+  gem.licenses = ['MIT']
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: schema_to_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
-- Humberto Pinto
 - João Soares
+- Humberto Pinto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies: []
 description: ! '  Command line app which parses a schema.rb file obtained from your
   rails repo or by running rake:schema:dump
 
 '
 email:
-- hlsp999@gmail.com
 - jsoaresgeral@gmail.com
+- hlsp999@gmail.com
 executables:
 - scaffold
 extensions: []
@@ -30,7 +30,6 @@ files:
 - README.md
 - Rakefile
 - bin/scaffold
-- lib/CommandLineHelpers.rb
 - lib/schema_to_scaffold.rb
 - lib/schema_to_scaffold/attribute.rb
 - lib/schema_to_scaffold/path.rb
@@ -39,8 +38,9 @@ files:
 - lib/schema_to_scaffold/version.rb
 - schema_to_scaffold.gemspec
 homepage: http://github.com/frenesim/schema_to_scaffold
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+post_install_message: Thanks for installing!
 rdoc_options: []
 require_paths:
 - lib

data/lib/CommandLineHelpers.rb

@@ -1,24 +0,0 @@
-require 'active_support/inflector'
-
-module CommandLineHelpers
-  extend self
-
-  class NotFollowingConventionsError < StandardError ; end
-  
-  class HelpMessages
-  
-    def help
-     print "Usage: schemafold [OPTION] PATH
-            Generate a rails scaffold script for the given schema.rb file
-            PATH is the path to the schema.rb file.
-
-            OPTIONS:
-              -x     put the rails scaffold script in your clipboard using xclip, type:
-                       sudo apt-get install xclip
-                     if you don't have it
-            "
-    end
-    
-  end
-  
-end