torquebox-stompbox 0.3.2 → 0.3.3

data/app/deployer.rb

@@ -37,6 +37,7 @@ class Deployer
   end
 
   def self.undeploy(push, async = true)
+    puts "Undeploying #{push.repo_name}/#{push.branch}"
     push.undeploy
     if async
       DeployerTask.async(:undeploy, :id=>push.id)
@@ -79,7 +80,7 @@ class Deployer
 
   # Hack to avoid problems with github responses using git gem over https
   def git_url
-    push.repo_url.sub('https://github.com/', 'git@github.com:')
+    push.repo_url.sub('https://github.com/', 'git://github.com/')
   end
 
   def deployment_path
@@ -101,14 +102,15 @@ class Deployer
   def write_descriptor
     repo   = push.find_repository
     if repo
-      config = push.find_repository.config
-      config ||= {}
+      config = repo.config.nil? ? {} : YAML.load(repo.config)
       config['application'] ||= {}
       config['application']['root'] = root
       config['application']['env'] ||= 'production'
       descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(config)
       descriptor.merge! config
       TorqueBox::DeployUtils.deploy_yaml( descriptor, deployment_file )
+    else
+      puts "Unable to find repository #{push.repo_name}/#{push.branch}"
     end
   end
 
@@ -129,12 +131,10 @@ class Deployer
 
   def freeze_gems
     puts "Freezing gems"
-    jruby = File.join( RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] )
-    if ( File.exist?( path_to('Gemfile') ) )
-      exec_cmd( "cd #{root} && #{jruby} -S bundle package" )
-      exec_cmd( "cd #{root} && #{jruby} -S bundle install --local --path vendor/bundle" )
-    else
-      exec_cmd( "cd #{root} && #{jruby} -S rake rails:freeze:gems" )
+    Dir.chdir( root ) do
+      jruby = File.join( RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] )
+      jruby << " --1.9" if RUBY_VERSION =~ /^1\.9\./
+      exec_command( "#{jruby} -S bundle install --deployment" )
     end
   end
 
@@ -142,26 +142,28 @@ class Deployer
     "#{root}/#{file}"
   end
 
-  def exec_cmd(cmd)
-    Open3.popen3( cmd ) do |stdin, stdout, stderr|
+  def exec_command(cmd)
+    IO.popen4( cmd ) do |pid, stdin, stdout, stderr|
       stdin.close
-      stdout_thr = Thread.new(stdout) {|stdout_io|
-        stdout_io.each_line do |l|
-          STDOUT.puts l
-          STDOUT.flush
-        end
-        stdout_io.close
-      }
-      stderr_thr = Thread.new(stderr) {|stderr_io|
-        stderr_io.each_line do |l|
-          STDERR.puts l
-          STDERR.flush
-        end
-      }
-      stdout_thr.join
-      stderr_thr.join
+      [
+       Thread.new(stdout) {|stdout_io|
+         stdout_io.each_line do |l|
+           STDOUT.puts l
+           STDOUT.flush
+         end
+         stdout_io.close
+       },
+
+       Thread.new(stderr) {|stderr_io|
+         stderr_io.each_line do |l|
+           STDERR.puts l
+           STDERR.flush
+         end
+       }
+      ].each( &:join )
     end
   end
+  
 end
 
 

data/app/models.rb

@@ -94,7 +94,7 @@ class Push
   end
 
   def find_repository
-    Repository.get(:name=>repo_name, :branch=>branch)
+    Repository.first(:name=>repo_name, :branch=>branch)
   end
 
   protected

data/app/tasks/deployer_task.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+$: << File.join(File.dirname(__FILE__), '..')
+
 require 'torquebox-messaging'
 require 'deployer'
 require 'models'

metadata

@@ -2,7 +2,7 @@
 name: torquebox-stompbox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
   - Lance Ball