short 0.5.0 → 0.5.1

data/bin/short

@@ -91,7 +91,7 @@ end
 
 def build
   gem_dir = File.expand_path(File.dirname(File.dirname(__FILE__)))
-  require 'rake'; load 'shortener/tasks/heroku.rake'
+  require 'rake'; require 'shortener/tasks/heroku'
   Rake::Task[:'short:heroku:build'].execute
   puts "Your shortener repo has been created, cd there to finish up the process"
 end

data/lib/shortener/tasks/{heroku.rake → heroku.rb}

@@ -10,7 +10,7 @@ namespace :short do
     end
 
     def _file(f)
-      fs = $existing_repo ? [f.to_s] : ['heroku', f.to_s]
+      fs = $existing_repo ? [f.to_s] : ['shortener-heroku', f.to_s]
       File.join(Dir.pwd, *fs)
     end
 
@@ -36,7 +36,7 @@ namespace :short do
       if ENV['VERBOSE']
         msg = "#{action}: #{start} "
         msg += "=> #{nd}" unless nd.nil?
-        puts msg 
+        puts msg
       end
     end
 
@@ -63,19 +63,19 @@ namespace :short do
 
     desc "Build a Heroku Ready Git repo"
     task :build do
-      FileUtils.mkdir(File.join(Dir.pwd, 'heroku')) unless $existing_repo
-      [:'server', :'server/public', :'server/views', 
-       :'server/views/s3', :'server/public/flash', 
-       :'server/public/skin', :'server/public/images', 
+      FileUtils.mkdir(File.join(Dir.pwd, 'shortener-heroku')) unless $existing_repo
+      [:'server', :'server/public', :'server/views',
+       :'server/views/s3', :'server/public/flash',
+       :'server/public/skin', :'server/public/images',
        :'server/public/skin/blue.monday'].each do |f|
         unless File.exist?(_file(f))
           puts "creating #{_file(f)}" if ENV['VERBOSE']
-          FileUtils.mkdir(_file(f)) 
+          FileUtils.mkdir(_file(f))
         end
       end
 
       ['server', 'server/public', 'server/views', :'server/views/s3',
-       :'server/public/flash', :'server/public/images', :'server/public/skin', 
+       :'server/public/flash', :'server/public/images', :'server/public/skin',
        :'server/public/skin/blue.monday'].each do |end_point|
         Dir["#{$gem_dir}/#{end_point}/**"].each do |f|
           next if File.directory?(f)
@@ -100,13 +100,13 @@ namespace :short do
       _l(:renaming, _s, _e)
       FileUtils.mv(_s, _e)
       File.open(_file(:Rakefile), 'w+') do |f|
-        f.puts "load 'shortener/tasks/heroku.rake'"
-      end 
+        f.puts "require 'shortener/tasks/heroku'"
+      end
     end
 
     desc "initialize the Git repo"
     task :git do
-      cmd = "git init heroku && cd heroku && git add . && git commit -m initial"
+      cmd = "git init && git add . && git commit -m initial"
       sh cmd
     end
 
@@ -140,8 +140,8 @@ namespace :short do
       sh cmd
     end
 
-    desc "Build, configure and push a shortener app to Heroku"
-    task :setup => [:build, :config, :push] do
+    desc "Init, configure and push a shortener app to Heroku"
+    task :setup => [:git, :config, :push] do
       puts "\nYour app has (hopefully) been created and pushed and available @" +
         " http://#{$name}.heroku.com\n\n" +
         "the Custom Domain Addon has been added, but still needs configuring, for" +
@@ -150,7 +150,7 @@ namespace :short do
 
   end # => heroku
 
-  namespace :data do 
+  namespace :data do
 
     desc "replace hyphenated keys with sanitized ones."
     task :dehyphenate_keys do

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70210385354960 !ruby/object:Gem::Requirement
+  requirement: &70182472182920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210385354960
+  version_requirements: *70182472182920
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70210385354320 !ruby/object:Gem::Requirement
+  requirement: &70182472178000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210385354320
+  version_requirements: *70182472178000
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70210385353860 !ruby/object:Gem::Requirement
+  requirement: &70182472176700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210385353860
+  version_requirements: *70182472176700
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70210385351560 !ruby/object:Gem::Requirement
+  requirement: &70182472176220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210385351560
+  version_requirements: *70182472176220
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com
@@ -101,7 +101,7 @@ files:
 - lib/shortener/server/views/s3/video.haml
 - lib/shortener/server/views/upload.haml
 - lib/shortener/short.rb
-- lib/shortener/tasks/heroku.rake
+- lib/shortener/tasks/heroku.rb
 - lib/shortener/version.rb
 - short.gemspec
 - test/test_configuration.rb