justonedb 1.0.0 → 1.1.0

data/README.rdoc

@@ -37,6 +37,16 @@ The PostgreSQL client program 'pg_dump' must be installed in order to use the mi
     $ justonedb heroku purge-old
     Purging JustOneDB 'OLD' configuration variables
 
+* Set default Heroku database to connect to JustOneDB
+    $ justonedb heroku make-default
+    Making JUSTONEDB_DBI_URL the default Rails database
+    DATABASE_URL now points directly to the JustOneDB database; application restarting
+
+* Reset default Heroku database from saved settings
+    $ justonedb heroku reset-default
+    Resetting DATABASE_URL from JUSTONEDB_SAVED_DATABASE_URL
+    DATABASE_URL has now been reset, application restarting
+
 == License
 
 Released under the [MIT license](http://www.opensource.org/licenses/mit-license.php).

data/justonedb-1.0.0.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
 
 	spec.authors = ["JustOneDB"]
 	spec.date = "2012-01-18"
-	spec.description = "Command-line tool for JustOneDB to assist in deployments on Heroku"
+	spec.description = "Command-line tool for JustOneDB to assist with deployments on Heroku"
 	spec.email = "support@justonedb.com"
 	spec.executables = ["justonedb"]
 	spec.files = `svn ls -R`.split("\n")

data/justonedb-1.1.0.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |spec|
+	spec.name = "justonedb"
+	spec.version = "1.1.0"
+
+	spec.authors = ["JustOneDB"]
+	spec.date = "2012-02-03"
+	spec.description = "Command-line tool for JustOneDB to assist with deployments on Heroku"
+	spec.email = "support@justonedb.com"
+	spec.executables = ["justonedb"]
+	spec.files = `svn ls -R`.split("\n")
+	spec.homepage = "http://www.justonedb.com/"
+	spec.require_paths = ['lib']
+	spec.rubygems_version = "1.8.10"
+	spec.summary = "Command-line tool for JustOneDB database deployed on Heroku."
+
+	spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+	spec.add_dependency 'heroku', '~> 2.15'
+	spec.add_dependency 'require_all', '~> 1.2.1'
+end

data/lib/justonedb/command/heroku/base.rb

@@ -44,6 +44,22 @@ module JustOneDB::Command
 						:summary => "Purge 'OLD' JustOneDB variables",
 						:options => NIL
 					},
+					{
+						:cmd_class => self,
+						:method => self.instance_method(:make_justone_default_database),
+						:platform => "heroku",
+						:command => "make-default",
+						:summary => "Make JustOneDB the default Heroku database",
+						:options => NIL
+					},
+					{
+						:cmd_class => self,
+						:method => self.instance_method(:reset_default_database),
+						:platform => "heroku",
+						:command => "reset-default",
+						:summary => "Reset the default Heroku database using DATABASE_URL_DEFAULT",
+						:options => NIL
+					},
 				]
 			end
 		end

data/lib/justonedb/command/heroku/make-default.rb

@@ -0,0 +1,34 @@
+require 'justonedb/command/base'
+require 'heroku/auth'
+require 'heroku/command'
+require 'heroku/command/base'
+
+module JustOneDB::Command
+	class Heroku < JustOneDB::Command::Base
+		# Make JustOneDB the default Rails database in heroku, by assigning JUSTONEDB_DBI_URL to DATABASE_URL
+		def make_justone_default_database(args, options)
+			herokuapi = ::Heroku::Command::BaseWithApp.new(args, options)
+
+			vars = herokuapi.heroku.config_vars(herokuapi.app)
+
+			raise InvalidAppConfig, "JUSTONEDB_DBI_URL undefined" unless vars["JUSTONEDB_DBI_URL"]
+
+			if vars["DATABASE_URL"] && vars["DATABASE_URL"] == vars["JUSTONEDB_DBI_URL"]
+				raise InvalidAppConfig, "DATABASE_URL is already using the JustOne database"
+			end
+
+			puts "Making JUSTONEDB_DBI_URL the default Rails database"
+
+			detected_app = herokuapi.app
+
+			if vars["DATABASE_URL"]
+				# Save the old one ...
+				herokuapi.heroku.add_config_vars(detected_app, { "JUSTONEDB_SAVED_DATABASE_URL" => vars["DATABASE_URL"] })
+			end
+
+			herokuapi.heroku.add_config_vars(detected_app, { "DATABASE_URL" => vars["JUSTONEDB_DBI_URL"] })
+
+			puts "DATABASE_URL now points directly to the JustOneDB database; application restarting"
+		end
+	end
+end

data/lib/justonedb/command/heroku/migrate.rb

@@ -7,6 +7,7 @@ require 'tmpdir'
 
 module JustOneDB::Command
 	class Heroku < JustOneDB::Command::Base
+		# Migrate JustOne database data from JUSTONEDB_DBI_URL to JUSTONEDB_NEW_DBI_URL
 		def migrate(args, options)
 			# Migrate data from JUSTONEDB_DBI_URL to JUSTONEDB_NEW_DBI_URL
 			# -d, --directory # Specify temporary dump directory

data/lib/justonedb/command/heroku/promote.rb

@@ -6,6 +6,7 @@ require 'heroku/command/base'
 module JustOneDB::Command
 	class Heroku < JustOneDB::Command::Base
 
+		# Promote 'NEW' JustOne database to current
 		def promote(args, options)
 			herokuapi = ::Heroku::Command::BaseWithApp.new(args, options)
 

data/lib/justonedb/command/heroku/purge-old.rb

@@ -6,6 +6,7 @@ require 'heroku/command/base'
 module JustOneDB::Command
 	class Heroku < JustOneDB::Command::Base
 
+		# Purge 'OLD' JustOneDB environment variables
 		def purge_old(args, options)
 			herokuapi = ::Heroku::Command::BaseWithApp.new(args, options)
 

data/lib/justonedb/command/heroku/reset-default.rb

@@ -0,0 +1,25 @@
+require 'justonedb/command/base'
+require 'heroku/auth'
+require 'heroku/command'
+require 'heroku/command/base'
+
+module JustOneDB::Command
+	class Heroku < JustOneDB::Command::Base
+		# Set DATABASE_URL back to JUSTONEDB_SAVED_DATABASE_URL
+		def reset_default_database(args, options)
+			herokuapi = ::Heroku::Command::BaseWithApp.new(args, options)
+
+			vars = herokuapi.heroku.config_vars(herokuapi.app)
+
+			raise InvalidAppConfig, "JUSTONEDB_SAVED_DATABASE_URL undefined" unless vars["JUSTONEDB_SAVED_DATABASE_URL"]
+
+			puts "Resetting DATABASE_URL from JUSTONEDB_SAVED_DATABASE_URL"
+
+			detected_app = herokuapi.app
+
+			herokuapi.heroku.add_config_vars(detected_app, { "DATABASE_URL" => vars["JUSTONEDB_SAVED_DATABASE_URL"] })
+
+			puts "DATABASE_URL has now been reset; application restarting"
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justonedb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &74934430 !ruby/object:Gem::Requirement
+  requirement: &74239400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.15'
   type: :runtime
   prerelease: false
-  version_requirements: *74934430
+  version_requirements: *74239400
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &74934000 !ruby/object:Gem::Requirement
+  requirement: &74238590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,8 +32,8 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *74934000
-description: Command-line tool for JustOneDB to assist in deployments on Heroku
+  version_requirements: *74238590
+description: Command-line tool for JustOneDB to assist with deployments on Heroku
 email: support@justonedb.com
 executables:
 - justonedb
@@ -44,11 +44,14 @@ files:
 - README.rdoc
 - bin/justonedb
 - justonedb-1.0.0.gemspec
+- justonedb-1.1.0.gemspec
 - lib/justonedb/command/base.rb
 - lib/justonedb/command/heroku/base.rb
+- lib/justonedb/command/heroku/make-default.rb
 - lib/justonedb/command/heroku/migrate.rb
 - lib/justonedb/command/heroku/promote.rb
 - lib/justonedb/command/heroku/purge-old.rb
+- lib/justonedb/command/heroku/reset-default.rb
 - lib/justonedb/command.rb
 homepage: http://www.justonedb.com/
 licenses: []
@@ -73,6 +76,6 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Command-line tool for JustOneDB database deployed on Heroku, or AppHarbor.
+summary: Command-line tool for JustOneDB database deployed on Heroku.
 test_files: []
 has_rdoc: