murlsh 1.9.0 → 1.9.1

data/ChangeLog

@@ -1,3 +1,12 @@
+1.9.1
+	2011-10-02
+
+	Detect if using Heroku and add postgresql gem to gemfile.
+
+	Automatically set root_url if using Heroku.
+
+	Remove sqlite3 as a dependency.
+
 1.9.0
 	2011-09-25
 

data/README.textile

@@ -57,8 +57,6 @@ rake app:gemfile
 bundle install
 
 rake heroku:config
-heroku info
-rake config[root_url,<your app's Heroku url>]
 rake config[s3_bucket,<your S3 bucket name>]
 rake config[s3_id,<your S3 id>]
 rake config[s3_secret,<your S3 secret>]

data/Rakefile

@@ -27,6 +27,8 @@ if File.exist?(db_config_file)
   config['db'] = YAML.load_file(db_config_file)['production']
 end
 
+heroku_info = {}
+
 # Wrapper for database connection and cleanup from a Rake task.
 def use_db(db_config)
   ActiveRecord::Base.establish_connection db_config
@@ -406,7 +408,7 @@ end
 namespace :app do
 
   desc 'Generate a bundler Gemfile for a murlsh instance.'
-  task :gemfile do
+  task :gemfile => %w{heroku:info} do
     open('Gemfile', 'w') do |f|
       f.write <<EOS
 # generated by 'rake app:gemfile'
@@ -414,6 +416,8 @@ namespace :app do
 source :rubygems
 
 gem 'murlsh', '= #{Murlsh::VERSION}'
+
+#{heroku_info.empty? ? '' : "gem 'pg'"}
 EOS
     end
   end
@@ -422,13 +426,27 @@ end
 
 namespace :heroku do
 
+  desc 'Get Heroku info.'
+  task :info do
+    output = `heroku info -r 2>/dev/null`
+    if $?.exitstatus == 0
+      puts 'Heroku detected'
+      heroku_info = Hash[output.split($/).map { |line| line.split('=', 2) }]
+    end
+  end
+
   desc 'Set config options for deployment on Heroku.'
-  task :config => %w{compress} do
+  task :config => %w{compress info} do
     config.delete 'cache_entitystore'
     config.delete 'cache_metastore'
+    puts 'removed cache_entitystore and cache_metastore from config, Rack::Cache disabled'
+
+    if heroku_url = heroku_info['web_url']
+      config['root_url'] = heroku_url
+      puts "Set root_url to #{config['root_url']}"
+    end
 
     Murlsh.write_ordered_hash config, 'config.yaml'
-    puts 'removed cache_entitystore and cache_metastore from config, Rack::Cache disabled'
   end
 
 end

data/lib/murlsh/version.rb

@@ -1,3 +1,3 @@
 module Murlsh
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/murlsh.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     rack-rewrite
     rmagick
     rmail
-    sqlite3
     tinyatom
     treetop
     twitter

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-25 00:00:00 -04:00
+date: 2011-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -243,7 +243,7 @@ dependencies:
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: tinyatom
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -257,7 +257,7 @@ dependencies:
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: tinyatom
+  name: treetop
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -271,7 +271,7 @@ dependencies:
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: treetop
+  name: twitter
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -285,7 +285,7 @@ dependencies:
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: twitter
+  name: fakeweb
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
@@ -296,10 +296,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: flog
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
@@ -313,7 +313,7 @@ dependencies:
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: flog
+  name: rack-test
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
@@ -327,7 +327,7 @@ dependencies:
   type: :development
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
@@ -340,20 +340,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id024
 description: Host your bookmarks or maintain a link blog
 email: 
 - matthewm@boedicker.org