engineyard-migrate 1.0.1 → 1.1.0

data/ChangeLog.md

@@ -1,6 +1,15 @@
 # Change Log
 
-A log of changes. But prettier.
+## 1.1.0 2012-04-30
+
+Heroku
+
+* Credentials now at ~/.netrc or ~/_netrc
+* Taps needs sqlite3 installed
+
+General:
+
+* A log of changes. But prettier.
 
 ## 1.0.1 2011-03-11
 

data/bin/ey-migrate

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 $:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+
 require 'engineyard-migrate'
 require 'engineyard-migrate/cli'
 

data/engineyard-migrate.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("engineyard")
+  s.add_dependency("engineyard", "~>1.4.11")
   s.add_dependency("heroku")
   s.add_dependency("POpen4", ["~> 0.1.4"])
   s.add_dependency("net-sftp", ["~> 2.0.5"])

data/features/migration_errors.feature

@@ -9,15 +9,6 @@ Feature: Migration errors
       Not a Salesforce Heroku application.
       """
 
-  Scenario: Fail if Heroku credentials not available
-    Given I clone the application "git@github.com:engineyard/heroku2ey-simple-app.git" as "simple-app"
-    And I have a Heroku application "heroku2ey-simple-app"
-    When I run local executable "ey-migrate" with arguments "heroku . --account heroku2ey --environment heroku2eysimpleapp_production"
-    Then I should see
-      """
-      Please setup your Salesforce Heroku credentials first.
-      """
-
   Scenario: Fail if no Git 'origin' repo URI
     Given I clone the application "git@github.com:engineyard/heroku2ey-simple-app.git" as "simple-app"
     And I have a Heroku application "heroku2ey-simple-app"

data/lib/engineyard-migrate/cli.rb

@@ -12,7 +12,7 @@ module Engineyard::Migrate
   class CLI < Thor
     include EY::UtilityMethods
     attr_reader :verbose
-    
+
     desc "heroku PATH", "Migrate this Heroku app to Engine Yard AppCloud"
     method_option :verbose, :aliases     => ["-V"], :desc => "Display more output"
     method_option :environment, :aliases => ["-e"], :desc => "Environment in which to deploy this application", :type => :string
@@ -32,14 +32,9 @@ module Engineyard::Migrate
           say "Requesting Heroku account information..."; $stdout.flush
           say "Heroku app:     "; say heroku_app_name, :green
 
-          heroku_credentials = File.expand_path("~/.heroku/credentials")
-          unless File.exists?(heroku_credentials)
-            error "Please setup your Salesforce Heroku credentials first."
-          end
-
           say `heroku info`
           say ""
-          
+
           repo = `git config remote.origin.url`.strip
           if repo.empty?
             error "Please host your Git repo externally and add as remote 'origin'.", <<-SUGGESTION.gsub(/^\s{12}/, '')
@@ -48,10 +43,10 @@ module Engineyard::Migrate
               $ gh create-from-local --private
             SUGGESTION
           end
-          unless EY::API.read_token
+          unless EY::API.new.token
             error "Please create, boot and deploy an AppCloud application for #{repo}."
           end
-          
+
           say "Requesting AppCloud account information..."; $stdout.flush
           @app, @environment = fetch_app_and_environment(options[:app], options[:environment], options[:account])
 
@@ -73,7 +68,7 @@ module Engineyard::Migrate
           say   "Hostname:       "; say   "#{app_master_host}"
           debug "$RACK_ENV:      "; debug "#{@environment.framework_env}"
           say ""
-      
+
           # TODO - what if no application deployed yet?
           # bash: line 0: cd: /data/heroku2eysimpleapp/current: No such file or directory
 
@@ -89,33 +84,36 @@ module Engineyard::Migrate
           #        "user" => "deploy",
           #     "weekday" => "*"
           # }
-          
+
           say "Testing AppCloud application status..."
-          
-          deploy_path_found = ssh_appcloud "test -d #{@app.name}/current && echo 'found'", 
+
+          deploy_path_found = ssh_appcloud "test -d #{@app.name}/current && echo 'found'",
             :path => '/data', :return_output => true
           error "Please deploy your AppCloud application before running migration." unless deploy_path_found =~ /found/
-      
+
           say "Setting up Heroku on AppCloud..."
 
-          ssh_appcloud "sudo gem install heroku taps --no-ri --no-rdoc -q"
+          ssh_appcloud "sudo gem install heroku taps sqlite3 mysql2 pg --no-ri --no-rdoc -q"
           ssh_appcloud "git remote rm heroku 2> /dev/null; git remote add heroku #{heroku_repo} 2> /dev/null"
 
           say "Uploading Heroku credential file..."
           home_path = ssh_appcloud("pwd", :path => "~", :return_output => true)
           debug "AppCloud $HOME: "; debug home_path, :yellow
-          ssh_appcloud "mkdir -p .heroku; chmod 700 .heroku", :path => home_path
-          
+
+          require 'heroku/auth'
+          netrc_file = File.basename(Heroku::Auth.netrc_path)
+          remote_netrc = File.join(home_path, ".netrc")
           Net::SFTP.start(app_master_host, app_master_user) do |sftp|
-            sftp.upload!(heroku_credentials, "#{home_path}/.heroku/credentials")
+            sftp.upload!(Heroku::Auth.netrc_path, remote_netrc)
           end
+          ssh_appcloud("chmod 0600 #{remote_netrc}")
           say ""
-          
+
           say "Migrating data from Heroku '#{heroku_app_name}' to AppCloud '#{@app.name}'..."
           env_vars = %w[RAILS_ENV RACK_ENV MERB_ENV].map {|var| "#{var}=#{@environment.framework_env}" }.join(" ")
           ssh_appcloud "#{env_vars} heroku db:pull --confirm #{heroku_app_name} 2>&1"
           say ""
-          
+
           say "Migration complete!", :green
         rescue SystemExit
         rescue EY::MultipleMatchesError => e
@@ -139,7 +137,7 @@ module Engineyard::Migrate
         end
       end
     end
-    
+
     map "-v" => :version, "--version" => :version, "-h" => :help, "--help" => :help
 
     private
@@ -147,7 +145,7 @@ module Engineyard::Migrate
       path  = options[:path] || "/data/#{@app.name}/current/"
       flags = " #{options[:flags]}" || "" if options[:flags] # app master by default
       full_cmd = "cd #{path}; #{cmd}"
-      ssh_cmd = "ey ssh #{Escape.shell_command(full_cmd)}#{flags} -e #{@environment.name} -c #{@environment.account.name}"
+      ssh_cmd = "ey ssh #{Escape.shell_command([full_cmd])}#{flags} -e #{@environment.name} -c #{@environment.account.name}"
       debug options[:return_output] ? "Capturing: " : "Running: "
       debug ssh_cmd, :yellow; $stdout.flush
       out = ""
@@ -162,15 +160,15 @@ module Engineyard::Migrate
             end
           end
         end
-        
+
        puts "exitstatus : #{ status.exitstatus }" unless status.exitstatus == 0
        out if options[:return_output]
     end
-    
+
     def say(msg, color = nil)
       color ? shell.say(msg, color) : shell.say(msg)
     end
-    
+
     def debug(msg, color = nil)
       say(msg, color) if verbose
     end
@@ -196,7 +194,7 @@ module Engineyard::Migrate
       say "  * Create an AppCloud environment for this application/git URL"
       say "  * Use --environment/--account flags to select an AppCloud environment"
     end
-    
+
     def too_many_environments_discovered(task, environments, *args)
       return no_environments_discovered if environments.empty?
       say "Multiple environments possible, please be more specific:", :red
@@ -207,6 +205,6 @@ module Engineyard::Migrate
       end
       exit 1
     end
-    
+
   end
 end

data/lib/engineyard-migrate/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Migrate
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,252 +1,251 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-migrate
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Dr Nic Williams
 - Danish Khan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: engineyard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: heroku
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.11
+- !ruby/object:Gem::Dependency
+  name: heroku
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: POpen4
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: POpen4
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 0
-        - 5
+      - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: cucumber-rails
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: cucumber-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: ssh-config
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: ssh-config
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: taps
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: taps
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        - 15
+      - !ruby/object:Gem::Version
         version: 0.3.15
   type: :development
-  version_requirements: *id014
-description: Want to migrate your Ruby on Rails application from Heroku (or similar) up to Engine Yard AppCloud? This is the tool for you.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.15
+description: Want to migrate your Ruby on Rails application from Heroku (or similar)
+  up to Engine Yard AppCloud? This is the tool for you.
+email:
 - drnicwilliams@gmail.com
-executables: 
+executables:
 - ey-migrate
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
 - ChangeLog.md
 - Gemfile
 - MIT-LICENSE
@@ -275,41 +274,37 @@ files:
 - lib/engineyard-migrate/cli.rb
 - lib/engineyard-migrate/version.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/engineyard/engineyard-migrate
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2927084688178105813
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2927084688178105813
 requirements: []
-
 rubyforge_project: engineyard-migrate
-rubygems_version: 1.5.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Migrate up to Engine Yard AppCloud from Heroku or similar.
-test_files: 
+test_files:
 - features/heroku.feature
 - features/migration_errors.feature
 - features/step_definitions/application_setup_steps.rb

data/.rvmrc

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.8.7-p330@engineyard-migrate"
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file, this is very fast and efficicent compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create use  "$environment_id"
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded, uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]] ; then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory you can uncomment the following code.
-#
-#   # Ensure that Bundler is installed, install it if it is not.
-#   if ! command -v bundle ; then
-#      printf "The rubygem 'bundler' is not installed, installing it now.\n"
-#      gem install bundler
-#   fi
-#
-#   # Bundle while redcing excess noise.
-#   printf "Bundling your gems this may take a few minutes on a fresh clone.\n"
-#   bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
-#
-