socks 0.2.10.beta → 0.2.11.beta

data/bin/socks

@@ -1,23 +1,34 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'commander/import'
+require 'rubygems' # Only needed for early versions.
+require 'commander/import' # Commander
+
+# Socks
 require 'socks'
+require 'socks/version'
+require 'socks/helpers'
+
+# For mkdir(), cd(), touch(), etc.
 require 'fileutils'
 
-program :version, Socks::VERSION
+
+program :version, '0.2.10.beta'
 program :description, 'A Ruby-Rack-based microframework'
 
-default_command :about
+default_command :about # Set default command to show the Socks 'about' page.
  
 command :new do |c|
   c.syntax = 'socks new [options]'
   c.summary = 'Create a new Socks app'
   c.description = 'Use Rack and other utilities to make a new Socks app from scratch'
-  c.action do |args, opt|
+  
+  c.action do |args, opts|
+  
+    # Helpers!
+    include Socks::Helpers
 
-    # Pull out the first arg in args[]
-    app = args[0]
+    # Pull out the first arg in args[...]
+    app = args[0] # This is the app name.
 
     # -------------------------------------------------------------------------
     #                              File Contents                              |
@@ -45,7 +56,7 @@ use Rack::Reloader, 0
 
 # Used to run your router (app!)
 # Go to config/router.rb to declare routes
-run #{app.capitalize}::Router"
+run #{to_class(app.capitalize)}::Router"
 
     gemfile = "# List dependencies for your app in your Gemfile, then run the `bundle` command
 
@@ -95,7 +106,7 @@ require File.expand_path(\"../lib/custom_tasks.rb\", __FILE__)"
 require \"http_router\"
 require \"socks\"
 
-module #{app.capitalize}
+module #{to_class(app.capitalize)}
     Router = HttpRouter.new do
 
       # See what you can do at https://github.com/joshbuddy/http_router 
@@ -197,6 +208,7 @@ end
     system("echo '#{cont_template}' >> app/controllers/#{cont}_controller.rb")
 
   end
+  
 end
 
 command :start do |c|
@@ -224,6 +236,14 @@ command :version do |c|
   end
 end
 
+command :update do |c|
+  c.syntax = 'socks update [options]'
+  c.description = 'Updated Socks'
+  c.action do |args, opts|
+    system('gem update socks')
+  end
+end
+
 command :about do |c|
   c.syntax = 'socks about [options]'
   c.action do |args, options|

data/lib/socks.rb

@@ -5,6 +5,8 @@ require "socks/helpers"
 
 require "socks/tasks/rake_tasks"
 
+# TODO: Move the above below the module definition.
+
 module Socks
 
   def self.config
@@ -15,4 +17,4 @@ module Socks
     config.configure attr, &block
   end
 
-end
+end

data/lib/socks/config.rb

@@ -4,6 +4,8 @@
 # end
 #
 
+# TODO: Get this working!
+
 module Socks
   class Config
 

data/lib/socks/helpers.rb

@@ -1,6 +1,15 @@
 require 'socks/tasks/rake_tasks'
 
 module Socks
-  class Helpers
+  module Helpers
+  
+    def to_class(str)
+      str.gsub(/(_|-)/, '') # At least it gets rid of _ and - for now.
+    end
+    
+    def shell(code)
+      system(code)
+    end
+    
   end
 end

data/lib/socks/router.rb

@@ -4,7 +4,7 @@ module Socks
 
     # This class is used as helpers, misc methods, etc. for the App:Router class
     # generated in your app.
-    class Router
+    module Router
       include Socks::RouterHelpers
     end
 end

data/lib/socks/router_helpers.rb

@@ -10,7 +10,7 @@ module Socks
     # @param [String] The string to display
     # @return [text] The text rendered onto the screen
     def txt(str)
-      return [200, {'Content-type' => 'text/plain'}, ["#{str}"]]
+      [200, {'Content-type' => 'text/plain'}, [str]]
     end
 
   end

data/lib/socks/tasks/rake_tasks.rb

@@ -1,6 +1,26 @@
 require 'rake'
+require 'socks/helpers'
 
-desc 'Run your RSpec tests'
-task :test do
-  sh 'rspec .'
+desc 'About Socks'
+task :about do
+
+  puts "Socks is a small, elegant, and simple framework for making web-apps using"
+  puts "Ruby, Rack, and many other various Gems."
+  
+  puts ""
+  
+  puts "Socks started out as a small experiment (originally called simple_rack)"
+  puts "that supplied a few methods for making apps."
+  
+  puts ""
+  
+  puts "Now that I've found so many interesting gems and resources, Socksc cont-"
+  puts "inues to retain in development, now with much more than ever planned!"
+  
 end
+
+desc 'Run your RSpec tests'
+task(:test) { system('rspec .') }
+
+desc 'View your todos using do_it'
+task(:todos) { system('do_it') }

data/lib/socks/version.rb

@@ -1,6 +1,5 @@
 module Socks
 
-  # The current version of Socks
-  VERSION = "0.2.10.beta"
+  VERSION = '0.2.11.beta'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socks
 version: !ruby/object:Gem::Version
-  version: 0.2.10.beta
+  version: 0.2.11.beta
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack