challah 0.3.4 → 0.3.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Challah 0.3.5
+
+* Now using [Highline](https://github.com/JEG2/highline) for rake tasks instead of sloppy custom methods.
+
 ## Challah 0.3.4
 
 * Added `challah/test` include to allow for testing in your app.

data/lib/challah/version.rb

@@ -1,3 +1,3 @@
 module Challah
-  VERSION = "0.3.4" unless defined?(::Challah::VERSION)
+  VERSION = "0.3.5" unless defined?(::Challah::VERSION)
 end

data/lib/tasks/crud.rake

@@ -1,4 +1,6 @@
-namespace :challah do
+require 'highline/import'
+
+namespace :challah do 
   namespace :permissions do
     desc "Create a new permission"
     task :create => :environment do
@@ -8,15 +10,12 @@ namespace :challah do
       banner('Creating a permission')
 
       # Grab the required fields.      
-      name = ask!('Name:')
+      name = ask('Permission name: ')
       key = name.to_s.parameterize.underscore
-      key = ask("Key [#{key}]:", key)
-      description = ask('Description [optional]:')
-      locked = ask('Lock this permission [Yes/No, Default: No]', 'No')
-      
-      locked = locked.to_s.downcase.strip.first == 'y'
+      key = ask('Key: ') { |q| q.default = key }      
+      description = ask('Description (optional): ')
       
-      permission = Permission.new(:name => name, :key => key, :description => description, :locked => locked)
+      permission = Permission.new(:name => name, :key => key, :description => description)
 
       puts "\n"
 
@@ -38,14 +37,10 @@ namespace :challah do
       banner('Creating a role')
 
       # Grab the required fields.    
-      name = ask!('Name:')
-      description = ask('Description [optional]:')
-      path = ask('Default path [default: /]', '/')
-      locked = ask('Lock this role [Yes/No, Default: No]', 'No')      
+      name = ask('Name: ')
+      description = ask('Description (optional): ')
       
-      locked = locked.to_s.downcase.strip.first == 'y'
-      
-      role = Role.new(:name => name, :description => description, :default_path => path, :locked => locked)
+      role = Role.new(:name => name, :description => description)
 
       puts "\n"
 
@@ -73,18 +68,24 @@ namespace :challah do
       end    
 
       # Grab the required fields.    
-      first_name = ask!('First name:')
-      last_name = ask!('Last name:')
-      email = ask!('Email:')
-      username = ask('Username [leave blank to use email address]:', email)
-      password = ask('Password:')    
+      first_name = ask('First name: ')
+      last_name = ask('Last name: ')
+      email = ask('Email: ')
+      username = ask('Username: ') { |q| q.default = email }
+      password = ask('Password: ') { |q| q.echo = false }
+      confirm = ask('Password again: ') { |q| q.echo = false }
 
       role_id = Role.admin.id
 
       # First user is always going to be an admin, otherwise ask for the role
       unless first_user
-        role = ask_for_role
-        role_id = role.id if role
+        choose do |menu|
+          menu.prompt = 'Choose a role for this user: '
+            
+          Role.all.each do |role|
+            menu.choice(role.name) { role_id = role.id }
+          end
+        end
       end
 
       user = User.new(:first_name => first_name, :last_name => last_name, :email => email, :username => username, :role_id => role_id, :password => password, :password_confirmation => password)
@@ -121,35 +122,4 @@ def check_for_tables
     puts "Oops, you need to run `rake challah:setup` before you create a user. The users table is required."
     exit 1
   end
-end
-
-def role_names
-  @role_names ||= Role.all.collect(&:name).sort.join('|')
-end
-
-def ask_for_role
-  role_name = ask!("Role Name: [#{role_names}]")
-  role = Role.find_by_name(role_name)  
-  return ask_for_role unless role  
-  role
-end
-
-def ask!(question)
-  ask(question, nil, false)
-end
-
-def ask(question, default = nil, allow_blank = true)
-  print " -> #{question} "
-  
-  result = STDIN.gets.chomp
-  
-  if result.nil? or result.to_s.strip == ""
-    if allow_blank
-      return default
-    else
-      return ask(question, default, allow_blank)
-    end
-  else
-    return result
-  end
 end

data/vendor/bundle/gems/highline-1.6.11/AUTHORS

@@ -0,0 +1,3 @@
+James Edward Gray II::  {james@grayproductions.net}[mailto:james@grayproductions.net]
+Gregory Brown::         {gregory.t.brown@gmail.com}[mailto:gregory.t.brown@gmail.com]
+Richard LeBer::         {richard.leber@gmail.com}[mailto:richard.leber@gmail.com]

data/vendor/bundle/gems/highline-1.6.11/CHANGELOG

@@ -0,0 +1,304 @@
+= Change Log
+
+Below is a complete listing of changes for each revision of HighLine.
+
+== 1.6.11
+
+* Fixed a bad test.  (Fix by Diego Elio Pettenò.)
+
+== 1.6.10
+
+* Fixed a regression that prevented asking for String arguments (by Jeffery
+  Sman.)
+* Fixed a testing incompatibility (by Hans de Graaff.)
+
+== 1.6.9
+
+* The new list modes now properly ignore escapes when sizing.
+* Added a project gemspec file.
+* Fixed a bug that prevented the use of termios (by tomdz).
+* Switch to JLine to provide better echo support on JRuby (by tomdz).
+
+== 1.6.8
+
+* Fix missing <tt>ERASE_CHAR</tt> reference (by Aaron Gifford).
+
+== 1.6.7
+
+* Fixed bug introduced in 1.6.6 attempted fix (by Aaron Gifford).
+
+== 1.6.6
+
+* Fixed old style references causing <tt>HighLine::String</tt> errors (by Aaron Gifford).
+
+== 1.6.5
+
+* HighLine#list() now correctly handles empty lists (fix by Lachlan Dowding).
+* HighLine#list() now supports <tt>:uneven_columns_across</tt> and
+  <tt>:uneven_columns_down</tt> modes.
+
+== 1.6.4
+
+* Add introspection methods to color_scheme: definition, keys, to_hash.
+* Add tests for new methods.
+
+== 1.6.3
+
+* Add color NONE.
+* Add RGB color capability.
+* Made 'color' available as a class or instance method of HighLine, for
+  instance: HighLine.color("foo", :blue)) or highline_obj.color("foo", :blue)
+  are now both possible and equivalent.
+* Add HighLine::String class with convenience methods: #color (alias
+  #foreground), #on (alias #background), colors, and styles. See
+  lib/string_extensions.rb.
+* Add (optional) ability to extend String with the same convenience methods from
+  HighLine::String, using Highline.colorize_strings.
+
+== 1.6.2
+
+* Correctly handle STDIN being closed before we receive any data (fix by
+  mleinart).
+* Try if msvcrt, if we can't load crtdll on Windows (fix by pepijnve).
+* A fix for nil_on_handled not running the action (reported by Andrew Davey).
+
+== 1.6.1
+
+* Fixed raw_no_echo_mode so that it uses stty -icanon rather than cbreak
+  as cbreak does not appear to be the posixly correct argument. It fails
+  on Solaris if cbreak is used.
+* Fixed an issue that kept Menu from showing the correct choices for 
+  disambiguation.
+* Removed a circular require that kept Ruby 1.9.2 from loading HighLine.
+* Fixed a bug that caused infinite looping when wrapping text without spaces.
+* Fixed it so that :auto paging accounts for the two lines it adds.
+* On JRuby, improved error message about ffi-ncurses.  Before 1.5.3, 
+  HighLine was silently swallowing error messages when ffi-ncurses gem
+  was installed without ncurses present on the system.
+* Reverted Aaron Simmons's patch to allow redirecting STDIN on Windows.  This
+  is the only way we could find to restore HighLine's character reading to
+  working order.
+
+== 1.5.2
+
+* Added support for using the ffi-ncurses gem which is supported in JRuby.
+* Added gem build instructions.
+
+== 1.5.1
+
+* Fixed the long standing echo true bug.
+  (reported by Lauri Tuominen)
+* Improved Windows API calls to support the redirection of STDIN.
+  (patch by Aaron Simmons)
+* Updated gem specification to avoid a deprecated call.
+* Made a minor documentation clarification about character mode support.
+* Worked around some API changes in Ruby's standard library in Ruby 1.9.
+  (patch by Jake Benilov)
+
+== 1.5.0
+
+* Fixed a bug that would prevent Readline from showing all completions.
+  (reported by Yaohan Chen)
+* Added the ability to pass a block to HighLine#agree().
+  (patch by Yaohan Chen)
+
+== 1.4.0
+
+* Made the code grabbing terminal size a little more cross-platform by
+  adding support for Solaris.  (patch by Ronald Braswell and Coey Minear)
+
+== 1.2.9
+
+* Additional work on the backspacing issue. (patch by Jeremy Hinegardner)
+* Fixed Readline prompt bug. (patch by Jeremy Hinegardner)
+
+== 1.2.8
+
+* Fixed backspacing past the prompt and interrupting a prompt bugs.
+  (patch by Jeremy Hinegardner)
+
+== 1.2.7
+
+* Fixed the stty indent bug.
+* Fixed the echo backspace bug.
+* Added HighLine::track_eof=() setting to work are threaded eof?() calls.
+
+== 1.2.6
+
+Patch by Jeremy Hinegardner:
+
+* Added ColorScheme support.
+* Added HighLine::Question.overwrite mode.
+* Various documentation fixes.
+
+== 1.2.5
+
+* Really fixed the bug I tried to fix in 1.2.4.
+
+== 1.2.4
+
+* Fixed a crash causing bug when using menus, reported by Patrick Hof.
+
+== 1.2.3
+
+* Treat Cygwin like a Posix OS, instead of a native Windows environment.
+
+== 1.2.2
+
+* Minor documentation corrections.
+* Applied Thomas Werschleiln's patch to fix termio buffering on Solaris.
+* Applied Justin Bailey's patch to allow canceling paged output.
+* Fixed a documentation bug in the description of character case settings.
+* Added a notice about termios in HighLine::Question#echo.
+* Finally working around the infamous "fast typing" bug
+
+== 1.2.1
+
+* Applied Justin Bailey's fix for the page_print() infinite loop bug.
+* Made a SystemExtensions module to expose OS level functionality other
+  libraries may want to access.
+* Publicly exposed the get_character() method, per user requests.
+* Added terminal_size(), output_cols(), and output_rows() methods.
+* Added :auto setting for warp_at=() and page_at=().
+
+== 1.2.0
+
+* Improved RubyForge and gem spec project descriptions.
+* Added basic examples to README.
+* Added a VERSION constant.
+* Added support for hidden menu commands.
+* Added Object.or_ask() when using highline/import.
+
+== 1.0.4
+
+* Moved the HighLine project to Subversion.
+* HighLine's color escapes can now be disabled.
+* Fixed EOF bug introduced in the last release.
+* Updated HighLine web page.
+* Moved to a forked development/stable version numbering.
+
+== 1.0.2
+
+* Removed old and broken help tests.
+* Fixed test case typo found by David A. Black.
+* Added ERb escapes processing to lists, for coloring list items.  Color escapes
+  do not add to list element size.
+* HighLine now throws EOFError when input is exhausted.
+
+== 1.0.1
+
+* Minor bug fix:  Moved help initialization to before response building, so help
+  would show up in the default responses.
+
+== 1.0.0
+
+* Fixed documentation typo pointed out by Gavin Kistner.
+* Added <tt>gather = ...</tt> option to question for fetching entire Arrays or
+  Hashes filled with answers.  You can set +gather+ to a count of answers to
+  collect, a String or Regexp matching the end of input, or a Hash where each
+  key can be used in a new question.
+* Added File support to HighLine.ask().  You can specify a _directory_ and a
+  _glob_ pattern that combine into a list of file choices the user can select
+  from.  You can choose to receive the user's answer as an open filehandle or as
+  a Pathname object.
+* Added Readline support for history and editing.
+* Added tab completion for menu  and file selection selection (requires
+  Readline).
+* Added an optional character limit for input.
+* Added a complete help system to HighLine's shell menu creation tools.
+
+== 0.6.1
+
+* Removed termios dependancy in gem, to fix Windows' install.
+
+== 0.6.0
+
+* Implemented HighLine.choose() for menu handling.
+  * Provided shortcut <tt>choose(item1, item2, ...)</tt> for simple menus.
+  * Allowed Ruby code to be attached to each menu item, to create a complete
+    menu solution.
+  * Provided for total customization of the menu layout.
+  * Allowed for menu selection by index, name or both.
+  * Added a _shell_ mode to allow menu selection with additional details
+    following the name.
+* Added a list() utility method that can be invoked just like color().  It can
+  layout Arrays for you in any output in the modes <tt>:columns_across</tt>,
+  <tt>:columns_down</tt>, <tt>:inline</tt> and <tt>:rows</tt>
+* Added support for <tt>echo = "*"</tt> style settings.  User code can now
+  choose the echo character this way.
+* Modified HighLine to user the "termios" library for character input, if
+  available.  Will return to old behavior (using "stty"), if "termios" cannot be
+  loaded.
+* Improved "stty" state restoring code.
+* Fixed "stty" code to handle interrupt signals.
+* Improved the default auto-complete error message and exposed this message
+  through the +responses+ interface as <tt>:no_completion</tt>.
+
+== 0.5.0
+
+* Implemented <tt>echo = false</tt> for HighLine::Question objects, primarily to
+  make fetching passwords trivial.
+* Fixed an auto-complete bug that could cause a crash when the user gave an
+  answer that didn't complete to any valid choice.
+* Implemented +case+ for HighLine::Question objects to provide character case 
+  conversions on given answers.  Can be set to <tt>:up</tt>, <tt>:down</tt>, or
+  <tt>:capitalize</tt>.
+* Exposed <tt>@answer</tt> to the response system, to allow response that are
+  aware of incorrect input.
+* Implemented +confirm+ for HighLine::Question objects to allow for verification
+  for sensitive user choices.  If set to +true+, user will have to answer an
+  "Are you sure?  " question.  Can also be set to the question to confirm with
+  the user.
+
+== 0.4.0
+
+* Added <tt>@wrap_at</tt> and <tt>@page_at</tt> settings and accessors to
+  HighLine, to control text flow.
+* Implemented line wrapping with adjustable limit.
+* Implemented paged printing with adjustable limit.
+
+== 0.3.0
+
+* Added support for installing with setup.rb.
+* All output is now treated as an ERb sequence, allowing Ruby code to be
+  embedded in output strings.
+* Added support for ANSI color sequences in say().  (And everything else
+  by extension.)
+* Added whitespace handling for answers.  Can be set to <tt>:strip</tt>,
+  <tt>:chomp</tt>, <tt>:collapse</tt>, <tt>:strip_and_collapse</tt>,
+  <tt>:chomp_and_collapse</tt>, <tt>:remove</tt>, or <tt>:none</tt>.
+* Exposed question details to ERb completion through @question, to allow for
+  intelligent responses.
+* Simplified HighLine internals using @question.
+* Added support for fetching single character input either with getc() or
+  HighLine's own cross-platform terminal input routine.
+* Improved type conversion to handle user defined classes.
+
+== 0.2.0
+
+* Added Unit Tests to cover an already fixed output bug in the future.
+* Added Rakefile and setup test action (default).
+* Renamed HighLine::Answer to HighLine::Question to better illustrate its role.
+* Renamed fetch_line() to get_response() to better define its goal.
+* Simplified explain_error in terms of the Question object.
+* Renamed accept?() to in_range?() to better define purpose.
+* Reworked valid?() into valid_answer?() to better fit Question object.
+* Reworked <tt>@member</tt> into <tt>@in</tt>, to make it easier to remember and
+  switched implementation to include?().
+* Added range checks for @above and @below.
+* Fixed the bug causing ask() to swallow NoMethodErrors.
+* Rolled ask_on_error() into responses.
+* Redirected imports to Kernel from Object.
+* Added support for <tt>validate = lambda { ... }</tt>.
+* Added default answer support.
+* Fixed bug that caused ask() to die with an empty question.
+* Added complete documentation.
+* Improve the implemetation of agree() to be the intended "yes" or "no" only
+  question.
+* Added Rake tasks for documentation and packaging.
+* Moved project to RubyForge.
+
+== 0.1.0
+
+* Initial release as the solution to
+  {Ruby Quiz #29}[http://www.rubyquiz.com/quiz29.html].