appsta 1.0.0 → 1.1.0

data/Manifest.txt

@@ -3,18 +3,20 @@ Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
-bin/appsta
 lib/appsta.rb
+lib/appsta/default_files.rb
 lib/appsta/heroku.rb
 lib/appsta/github.rb
 lib/appsta/git.rb
-lib/template.rb
+lib/appsta/jquery.rb
 resources/README.erb
 resources/index.html.erb
 script/console
 script/destroy
 script/generate
+test/test_default_files.rb
 test/test_heroku.rb
 test/test_github.rb
 test/test_git.rb
 test/test_helper.rb
+test/test_jquery.rb

data/README.rdoc

@@ -1,7 +1,7 @@
 = appsta
 
 * http://appsta.com
-* http://github.com/edraper/appsta
+* http://github.com/ejdraper/appsta
 
 == DESCRIPTION:
 
@@ -10,23 +10,19 @@
 == FEATURES:
 
 * It provides a helper library for writing Rails templates, to quickly setup your projects on Heroku, GitHub, and other things to get your app up and running quickly.
-* It also provides a command line tool to quickly create applications using a default template that uses the Appsta helper library to get you up to speed nice and quickly.
 
 == SYNOPSIS:
 
-* You can create a new applicaion using the default Appsta template by running the following from the command line:
-
-    appsta <app_name>
-
-* You can also use the Appsta helper methods in your own templates, by requiring the Appsta library and loading it within the template:
+* You can use the Appsta helper methods in your own templates, by requiring the Appsta library and loading it within the template:
 
     require "appsta"
     Appsta.load
 
-* For an idea of the functionality available within the template helpers, look at the default template that the Appsta command line tool uses.
+* For an idea of the functionality available within the template helpers, please review the helpers defined in lib/appsta, or take a look at the docs on GitHub.
 
 == REQUIREMENTS:
 
+* rails (v2.3 and above)
 * heroku
 * rest_client
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems' unless ENV['NO_RUBYGEMS']
-%w[rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rake rake/clean fileutils newgem rubigen hoe].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/appsta'
 
 # Generate all the Rake tasks
@@ -14,7 +14,8 @@ $hoe = Hoe.new('appsta', Appsta::VERSION) do |p|
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
+                     ]
+  p.summary = "Appsta is designed to make bootstrapping new Rails applications much easier."
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"

data/lib/appsta.rb

@@ -1,13 +1,17 @@
+require File.join(File.dirname(__FILE__), "appsta", "default_files")
 require File.join(File.dirname(__FILE__), "appsta", "heroku")
 require File.join(File.dirname(__FILE__), "appsta", "github")
 require File.join(File.dirname(__FILE__), "appsta", "git")
+require File.join(File.dirname(__FILE__), "appsta", "jquery")
 
 module Appsta
-  VERSION = "1.0.0"
-  
+  VERSION = "1.1.0"
+
+  include Appsta::DefaultFiles
   include Appsta::Heroku
   include Appsta::GitHub
   include Appsta::Git
+  include Appsta::JQuery
 
   class << self
     # This loads Appsta so that it's methods are available to the template runner

data/lib/appsta/default_files.rb

@@ -0,0 +1,10 @@
+module Appsta
+  module DefaultFiles
+    # This removes some of the default files that we don't really need for a fresh Rails app
+    def remove_default_files
+      ["README", "public/index.html", "public/favicon.ico"].each do |path|
+        run "rm -f #{path}"
+      end
+    end
+  end
+end

data/lib/appsta/git.rb

@@ -6,5 +6,12 @@ module Appsta
       git(:add => ".")
       git(:commit => "-a -m '#{message}'")
     end
+    
+    # This pushes to the remotes specified
+    def git_push(*remotes)
+      remotes.each do |remote|
+        git(:push => "#{remote} master")
+      end
+    end
   end
 end

data/lib/appsta/jquery.rb

@@ -0,0 +1,9 @@
+module Appsta
+  module JQuery
+    # This removes existing built-in JS and switches to jQuery for your Rails app
+    def use_jquery(version = "1.3.2")
+      run "rm -f public/javascripts/*"
+      run "curl -s -L http://jqueryjs.googlecode.com/files/jquery-#{version}.min.js > public/javascripts/jquery.js"
+    end
+  end
+end

data/test/test_default_files.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class RunDefaultFiles
+  include Appsta::DefaultFiles
+end
+
+class TestDefaultFiles < Test::Unit::TestCase
+  context "Removing default files" do
+    setup do
+      RunDefaultFiles.any_instance.expects(:run).with("rm -f README")
+      RunDefaultFiles.any_instance.expects(:run).with("rm -f public/index.html")
+      RunDefaultFiles.any_instance.expects(:run).with("rm -f public/favicon.ico")
+    end
+
+    should "not fail" do
+      assert true, RunDefaultFiles.new.remove_default_files
+    end
+  end
+end

data/test/test_git.rb

@@ -28,6 +28,20 @@ class TestGit < Test::Unit::TestCase
       assert true, RunGit.new.git_setup(CUSTOM_MESSAGE)
     end
   end
+
+  context "Pushing Git" do
+    should "not fail to a single remote" do
+      RunGit.any_instance.expects(:git).with(:push => "origin master")
+      assert true, RunGit.new.git_push(:origin)
+    end
+
+    should "not fail to multiple remotes" do
+      RunGit.any_instance.expects(:git).with(:push => "origin master")
+      RunGit.any_instance.expects(:git).with(:push => "staging master")
+      RunGit.any_instance.expects(:git).with(:push => "production master")
+      assert true, RunGit.new.git_push(:origin, :staging, :production)
+    end
+  end
   
   # This sets up the mocks common to all contexts
   def setup_base_mocks

data/test/test_jquery.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class RunJQuery
+  include Appsta::JQuery
+end
+
+class TestJQuery < Test::Unit::TestCase
+  context "Switching to jQuery" do
+    setup do
+      RunJQuery.any_instance.expects(:run).with("rm -f public/javascripts/*")
+    end
+
+    should "not fail" do
+      RunJQuery.any_instance.expects(:run).with("curl -s -L http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js > public/javascripts/jquery.js")
+      assert true, RunJQuery.new.use_jquery
+    end
+
+    should "not fail for a specific version of jQuery" do
+      RunJQuery.any_instance.expects(:run).with("curl -s -L http://jqueryjs.googlecode.com/files/jquery-1.3.3.min.js > public/javascripts/jquery.js")
+      assert true, RunJQuery.new.use_jquery("1.3.3")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appsta
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Elliott Draper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 +01:00
+date: 2009-12-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,49 +50,50 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
-description: "* Appsta is designed to make bootstrapping new Rails applications much easier."
+description: ""
 email: 
 - el@ejdraper.com
-executables: 
-- appsta
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
 - Rakefile
-- bin/appsta
 - lib/appsta.rb
+- lib/appsta/default_files.rb
 - lib/appsta/heroku.rb
 - lib/appsta/github.rb
 - lib/appsta/git.rb
-- lib/template.rb
+- lib/appsta/jquery.rb
 - resources/README.erb
 - resources/index.html.erb
 - script/console
 - script/destroy
 - script/generate
+- test/test_default_files.rb
 - test/test_heroku.rb
 - test/test_github.rb
 - test/test_git.rb
 - test/test_helper.rb
+- test/test_jquery.rb
 has_rdoc: true
-homepage: http://appsta.com
+homepage: 
 licenses: []
 
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -110,13 +111,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: appsta
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "* Appsta is designed to make bootstrapping new Rails applications much easier."
+summary: Appsta is designed to make bootstrapping new Rails applications much easier.
 test_files: 
 - test/test_appsta.rb
+- test/test_default_files.rb
 - test/test_git.rb
 - test/test_github.rb
 - test/test_helper.rb
 - test/test_heroku.rb
+- test/test_jquery.rb

data/bin/appsta

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-# Load what we need
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require "rubygems"
-require "appsta"
-
-# Display the Appsta version
-def display_version
-  puts "Appsta (#{Appsta::VERSION})"
-end
-
-# Handle the help command, also display it when no arguments are specified
-if ARGV.empty? || ARGV[0] == "-h" || ARGV[0] == "--help"
-  display_version
-  puts " -h, --help     : display this help message"
-  puts " -v, --version  : display the Appsta version"
-  puts " appsta <name>  : create a Rails application using Appsta with the specified name"
-  puts ""
-  puts "By default, Appsta will initialize a local Git repository, setup your application"
-  puts "on Heroku with two environments (production and staging) and will also setup your"
-  puts "project repository on GitHub. It will also setup some useful gems and libraries."
-elsif ARGV[0] == "-v" || ARGV[0] == "--version"
-  # This displays the Appsta version
-  display_version
-elsif ARGV[0][0...1] == "-"
-  # This handles unknown commands
-  display_version
-  puts "Unknown command #{ARGV[0]}"
-else
-  # This actually creates the application specified
-  display_version
-  puts "Creating application #{ARGV[0]}"
-  Kernel.system "rails -m #{File.join(File.dirname(__FILE__), "..", "lib", "template.rb")} #{ARGV[0]}"
-end

data/lib/template.rb

@@ -1,45 +0,0 @@
-require "appsta"
-Appsta.load
-
-# This works out the name of the app
-name = File.basename(Dir.pwd)
-
-# Remove certain files
-["README", "public/index.html", "public/favicon.ico", "public/javascripts/*"].each do |path|
-  run "rm -f #{path}"
-end
-
-# Grab jQuery for use in the app
-run "curl -s -L http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js > public/javascripts/jquery.js"
-
-# Setup the gems we want, including the creation of the Heroku gem manifest
-gems = [
-        {:name => "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com"},
-        {:name => "mocha"},
-        {:name => "cucumber"},
-        {:name => "hpricot"},
-        {:name => "authlogic"}
-       ]
-heroku_gems gems
-
-# Install all the gems we need
-rake "gems:install", :sudo => true
-
-# Setup the Git repo
-git_setup
-
-# Setup the app on Heroku
-heroku_urls = []
-[:production, :staging].each { |env| heroku_urls << heroku(env) }
-
-# Setup the project repo on GitHub
-github_url = github
-
-# Setup the index.html and README files that Appsta auto-generates
-file "README", ERB.new(File.read(File.join(Appsta.resources_path, "README.erb"))).result(binding)
-file "public/index.html", ERB.new(File.read(File.join(Appsta.resources_path, "index.html.erb"))).result(binding)
-
-# Update the git repo with our changes and push them
-git :add => "."
-git :commit => "-a -m 'added README and public/index.html'"
-[:origin, :production, :staging].each { |remote| git(:push => "#{remote} master") }