tsukuru 0.1.0 → 0.1.1

data/README.md

@@ -1,11 +1,10 @@
 Tsukuru will fetch your latest bundle and prepare it for running locally. It keeps an archive of downloaded bundles. You can also use restore from a local bundle (archived or manually downloaded).
 
-    Usage: reanimate
-        -a, --app NAME                   Application name
-        -c, --capture                    Capture a new bundle instead of using the latest one
-        -p, --password                   Yuur Heroku password
-        -h, --help                       Display this message
-        -l, --local FILE                 Use a local bundle instead of downloading
-        -t, --target PATH                Path to where the application should be restored
-        -r, --reindex                    Start search deamon and reindex (sunspot + solr only)
-        -u, --username                   Your Heroku username
+    Usage: tsukuru
+    -a, --app NAME                   Application name
+    -c, --capture                    Capture a new bundle instead of using the latest one
+    -h, --help                       Display this message
+    -l, --local FILE                 Use a local bundle instead of downloading
+    -t, --target PATH                Path to where the application should be restored
+    -r, --reindex                    Start search deamon and reindex (sunspot + solr only)
+

data/Rakefile

@@ -7,6 +7,9 @@ begin
     gemspec.email = "tel@jklm.no"
     gemspec.homepage = "http://github.com/toreriklinnerud/tsukuru"
     gemspec.authors = ["Tor Erik Linnerud"]
+    gemspec.add_dependency 'ruby-unix-now'
+    gemspec.add_dependency 'rest-client'
+    gemspec.add_dependency 'heroku'
 
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/tsukuru

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 require 'heroku'
 require 'restclient'
@@ -24,10 +25,6 @@ parser = OptionParser.new do|opts|
     options.capture = true
   end
 
-  opts.on( '-p', '--password', 'Yuur Heroku password' ) do |password|
-    options.password = password
-  end
-
   opts.on('-h', '--help', 'Display this message') do
    puts opts
    exit
@@ -44,11 +41,6 @@ parser = OptionParser.new do|opts|
   opts.on( '-r', '--reindex', 'Start search deamon and reindex (sunspot + solr only)' ) do
     options.reindex = true
   end
-
-  opts.on( '-u', '--username', 'Your Heroku username' ) do |password|
-    options.password = password
-  end
-
 end.parse!
 
 def error(msg)
@@ -63,10 +55,13 @@ options.current = options.target + 'current'
 @options = options
 
 if !options.local
-  error('You must provide your heroku username') unless options.username
-  error('You must provide your heroku password') unless options.password
+  credentials_file = File.expand_path("~/.heroku/credentials")
+  unless File.exist?(credentials_file)
+    error("Run 'heroku info --app #{options.app}' once to set up your Heroku credentials")
+  end
+  credentials = File.read(credentials_file).split("\n")
 
-  heroku = Heroku::Client.new(*CREDENTIALS)
+  heroku = Heroku::Client.new(*credentials)
   if options.capture
     heroku.bundle_capture(options.app)
     puts 'Starting capture'
@@ -113,9 +108,15 @@ FileUtils.mkdir_p(tempdir)
 compression_type = (bundle_file =~ /.gz$/) ? :z : :j
 run :tar, :x, compression_type, :C => tempdir, :f => bundle_file
 
-extracted_folder = Dir.glob("#{tempdir}/*").first
+extracted_folder = Pathname.new(Dir.glob("#{tempdir}/*").first)
 error("Extraction of #{tempdir} failed") unless extracted_folder
 
+if !options.local
+  archive = options.target + 'archive'
+  FileUtils.mkdir_p(archive)
+  run 'tar', '-cj', {:f => "#{archive}/#{bundle[:name]}.tar.bz2", :C => extracted_folder.dirname}, extracted_folder.basename
+end
+
 FileUtils.mkdir_p(options.target)
 FileUtils.rm_rf(options.current)
 FileUtils.mv(extracted_folder, options.current)
@@ -145,10 +146,4 @@ end
 in_app 'mkdir -p tmp'
 in_app 'touch', 'tmp/restart'
 
-if !options.local
-  archive = options.target + 'archive'
-  FileUtils.mkdir_p(archive)
-  run 'tar', '-cjf', "#{archive}.tar.bz2", extracted_folder
-end
-
 FileUtils.rm_rf(tempdir)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tor Erik Linnerud
@@ -16,8 +16,43 @@ cert_chain: []
 
 date: 2010-04-28 00:00:00 +01:00
 default_executable: tsukuru
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-unix-now
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: heroku
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Tsukuru will fetch your latest bundle and prepare it for running locally. It keeps an archive of downloaded bundles.
 email: tel@jklm.no
 executables: