whales 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c973de77c80a73bd76fca8245db409ec02751af
-  data.tar.gz: c74ef37085411dc87f1a7aca7f0a030a47735582
+  metadata.gz: 432eca4b7237146ea26c438eff7cff039ca635e9
+  data.tar.gz: e992aeb760254fb76f380b1173f30872690fdba3
 SHA512:
-  metadata.gz: a2be9212612412616df134c5469f2dcc414f5c090cfb7df0e445c15a802ca65d7c157467978831cdb570a3408d9a6e07cc622dc35c46739d6cd9c86e63c78acc
-  data.tar.gz: 73763f054639512b13405470152d79d5a80058fded16d957bda19478a18daee7625b5c2ff5100e26666fa47e1b0bdc1fb37533afe535f4fa9622a1cfb2cc1071
+  metadata.gz: 944668bed427b2e7fd759fe8cf8850e643f14006ebdad0c7158d78a9d2361a4a78ecb45155531aee707d73dbfda21cc405477d6bc885946b4839afd76320d2c4
+  data.tar.gz: 99e73783ac7b24d4bbbc04ead603cca0f395fdb3e365ddd4bfd5a8edc5e0ad268785c19d26fc5bd071dd05b10669ab26434a149423b630cfb680af18db28afd3

data/README.md

@@ -6,19 +6,22 @@ is a lightweight web framework written in Ruby, inspired by popular MVC framewor
 
 ##Installation
 
-The easiest way to install Whales is to clone this repo.
+Whales can be installed using RubyGems:
+`gem install 'whales'`
+
+Or you can include it directly in your projects Gemfile:
+`gem 'whales', '0.1.1'`
 
 ##Your First Whales Project
 **Create a new app:**
 ```
-cd whales
-./whales new MyApp
+whales new MyApp
 ```
 
 **Start working:**
 ```
 # cd into the new folder
-cd ../MyApp
+cd MyApp
 
 # start the server
 whales server

data/exe/whales

@@ -1,64 +1,66 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'fileutils'
 include FileUtils
+require 'whales_orm'
 
-if ARGV.first == 'new' && ARGV[1]
-  puts "Making new Whales App:"
-  app_name = ARGV[1]
-  display = {verbose: true}
+options = {}
+
+subtext = <<HELP
+Commonly used command are:
+   new :     creates new Whales app
+   server :  start a Whales app server
+See 'whales COMMAND --help' for more information on a specific command.
+HELP
+
+global = OptionParser.new do |opts|
+  opts.banner = "Usage: whales [options] [subcommand [options]]"
+  opts.on("-q", "--quiet", "Run verbosely") do
+    options[:verbose] = false
+  end
+  opts.separator ""
+  opts.separator subtext
+end
+# end.parse!
+
+subcommands = {
+  'new' => OptionParser.new do |opts|
+    opts.banner = "Usage: new [app_name] [options]"
+  end,
+  'server' => OptionParser.new do |opts|
+    opts.banner = "Usage: server [options]"
+  end
+}
 
+global.order!
+command = ARGV.shift
+subcommands[command].order!
+
+options[:verbose] = true if options[:verbose].nil?
+
+case command
+when 'new'
+  puts "Making new Whales App:"
+  app_name = ARGV.shift
+  display = { verbose: options[:verbose] }
   mkdir app_name, display
   cd app_name
   touch "routes.rb", display
-  File.open("routes.rb", 'w') do |f|
-    f.write <<-TEXT
-require_relative '../whales/whales_actions/lib/whales_controller/base'
-
-def make_router
-  router = WhalesDispatch::Router.new
-
-  router.draw do
-    # include routes using this syntax:
-    # get Regexp.new("^/users/new$"), UsersController, :new
-    # or
-    # resources :users, :parent, only: [:new]
-    #
-    # nested resources are given as blocks to :parent resources
-    # resources :posts, :parent do
-    #   resources :comments, :nested, only: [:index, :new, :create]
-    # end
-  end
 
-  router
-end
-    TEXT
+  File.open("routes.rb", 'w') do |f|
+    f.write File.read(File.join(__dir__, '../template/routes.rb'))
   end
 
   touch "Gemfile", display
   File.open("Gemfile", "w") do |f|
-    f.write <<-TEXT
-source 'https://rubygems.org'\n
-
-require 'whales'
-    TEXT
+    f.write File.read(File.join(__dir__, '../template/Gemfile'))
   end
 
   mkdir "config", display
   touch "config/database.rb", display
   File.open("config/database.rb", "w") do |f|
-    f.write <<-TEXT
-require 'whales_orm'
-
-# https://tomafro.net/2010/01/tip-relative-paths-with-file-expand-path
-ROOT_FOLDER = File.join(File.dirname(__FILE__), '../db')
-
-# sql file name goes here, the default is database.sql
-SQL_FILE = File.join(ROOT_FOLDER, 'database.sql')
-
-# Here you can configure where you want the database file to be saved
-DB_FILE = File.join(ROOT_FOLDER, 'database.db')
-    TEXT
+    f.write File.read(File.join(__dir__, '../template/database.rb'))
   end
 
   mkdir "db", display
@@ -68,32 +70,21 @@ DB_FILE = File.join(ROOT_FOLDER, 'database.db')
 
   touch "app/controllers/application_controller.rb", display
   File.open("app/controllers/application_controller.rb", "w") do |f|
-    f.write <<-TEXT
-require 'whales_actions'
-require_relative '../../config/database.rb'
-
-class ApplicationController < WhalesController::Base
-end
-    TEXT
+    f.write File.read(File.join(__dir__, '../template/application_controller.rb'))
   end
 
   cd 'app'
   mkdir 'models', display
   mkdir 'views'
-
-end
-
-# if ARGV.first == 'server' || ARGV.first == 's'
-#   start_server(router)
-# end
-
-if ARGV.first == 'generate' || ARGV.first == 'g' && ARGV.length == 3
+when "server" || "s"
+  puts $LOAD_PATH
+  require_relative "../../whales_app/routes"
+  require_relative "../server"
+  start_server(make_router)
+when 'generate' || 'g'
   type = ARGV[1]
   name = ARGV[2]
 
-  path = "app/#{type}s/#{name.downcase}.rb"
-  touch path
-
   if type == "model"
     path = "app/#{type}s/#{name.downcase}.rb"
     touch path

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: whales
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - William Horton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: whales_actions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: whales_orm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 description: 
 email:
 - wdt.horton@gmail.com