winton-ubistrano 1.2.6 → 1.2.7

data/Rakefile

@@ -1,31 +1,25 @@
+require 'rubygems'
 require 'rake'
+require 'rake/gempackagetask'
+require 'spec/rake/spectask'
+require 'gemspec'
 
-task :default => 'ubistrano.gemspec'
-
-file 'ubistrano.gemspec' => FileList['{example,lib,templates}/**','Rakefile'] do |f|
-  # read spec file and split out manifest section
-  spec = File.read(f.name)
-  parts = spec.split("  # = MANIFEST =\n")
-  fail 'bad spec' if parts.length != 3
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject{ |file| file =~ /^\./ }.
-    reject { |file| file =~ /^doc/ }.
-    map{ |file| "    #{file}" }.
-    join("\n")
-  # piece file back together and write...
-  parts[1] = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = parts.join("  # = MANIFEST =\n")
-  File.open(f.name, 'w') { |io| io.write(spec) }
-  puts "Updated #{f.name}"
+desc "Generate gemspec"
+task :gemspec do
+  File.open("#{Dir.pwd}/#{GEM_NAME}.gemspec", 'w') do |f|
+    f.write(GEM_SPEC.to_ruby)
+  end
 end
 
-# sudo rake install
+desc "Install gem"
 task :install do
-  `sudo gem uninstall ubistrano -x`
-  `gem build ubistrano.gemspec`
-  `sudo gem install ubistrano*.gem`
-  `rm ubistrano*.gem`
+  Rake::Task['gem'].invoke
+  `sudo gem uninstall #{GEM_NAME} -x`
+  `sudo gem install pkg/#{GEM_NAME}*.gem`
+  `rm -Rf pkg`
+end
+
+desc "Package gem"
+Rake::GemPackageTask.new(GEM_SPEC) do |pkg|
+  pkg.gem_spec = GEM_SPEC
 end

data/changelog.markdown

@@ -1,3 +1,10 @@
+Version 1.2.7
+-------------
+
+* More work on Sinatra tasks
+* God init.d updates
+* Better Rakefile
+
 Version 1.2.6
 -------------
 

data/gemspec.rb

@@ -0,0 +1,19 @@
+GEM_NAME = 'ubistrano'
+GEM_FILES = FileList['**/*'] - FileList['coverage', 'coverage/**/*', 'pkg', 'pkg/**/*']
+GEM_SPEC = Gem::Specification.new do |s|
+  # == CONFIGURE ==
+  s.author = "Winton Welsh"
+  s.email = "mail@wintoni.us"
+  s.homepage = "http://github.com/winton/#{GEM_NAME}"
+  s.summary = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
+  # == CONFIGURE ==
+  s.add_dependency('amazon-ec2', '=0.4.5')
+  s.executables << 'ubify'
+  s.extra_rdoc_files = [ "README.markdown" ]
+  s.files = GEM_FILES.to_a
+  s.has_rdoc = false
+  s.name = GEM_NAME
+  s.platform = Gem::Platform::RUBY
+  s.require_path = "lib"
+  s.version = "1.2.7"
+end

data/lib/ubistrano.rb

@@ -1,4 +1,5 @@
 
+gem 'amazon-ec2', '=0.4.5'
 require 'EC2'
 require 'pp'
 

data/lib/ubistrano/sinatra.rb

@@ -10,9 +10,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
       
-      desc "Copies files in the shared config folder into our app"
+      desc "Copies yml files in the shared config folder into our app config"
       task :to_app, :roles => :app do
-        run "cp -Rf #{shared_path}/config/* #{release_path}"
+        run "cp -Rf #{shared_path}/config/* #{release_path}/config"
       end
     end
   end

data/templates/ubuntu/god.erb

@@ -10,18 +10,18 @@ RETVAL=0
 
 case "$1" in
     start)
-      /usr/local/bin/god -P /var/run/god.pid -l /var/log/god.log
-      /usr/local/bin/god load /usr/local/etc/god.god
+      sudo /usr/local/bin/god -P /var/run/god.pid -l /var/log/god.log
+      sudo /usr/local/bin/god load /usr/local/etc/god.god
       RETVAL=$?
   ;;
     stop)
-      kill `cat /var/run/god.pid`
+      sudo kill `cat /var/run/god.pid`
       RETVAL=$?
   ;;
     restart)
-      kill `cat /var/run/god.pid`
-      /usr/local/bin/god -P /var/run/god.pid -l /var/log/god.log
-      /usr/local/bin/god load /usr/local/etc/god.god
+      sudo kill `cat /var/run/god.pid`
+      sudo /usr/local/bin/god -P /var/run/god.pid -l /var/log/god.log
+      sudo /usr/local/bin/god load /usr/local/etc/god.god
       RETVAL=$?
   ;;
     status)

data/ubistrano.gemspec

@@ -1,50 +1,32 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name    = 'ubistrano'
-  s.version = '1.2.6'
-  s.date    = '2008-06-27'
-  
-  s.summary     = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
-  s.description = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
-  
-  s.author   = 'Winton Welsh'
-  s.email    = 'mail@wintoni.us'
-  s.homepage = 'http://github.com/winton/ubistrano'
-  
-  s.add_dependency 'amazon-ec2', '>= 0.3.2'
+  s.name = %q{ubistrano}
+  s.version = "1.2.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Winton Welsh"]
+  s.date = %q{2009-06-28}
+  s.default_executable = %q{ubify}
+  s.email = %q{mail@wintoni.us}
   s.executables = ["ubify"]
-  s.has_rdoc = false
-  
-  # = MANIFEST =
-  s.files = %w[
-    MIT-LICENSE
-    README.markdown
-    Rakefile
-    bin/ubify
-    changelog.markdown
-    example/deploy.rb
-    lib/ubistrano.rb
-    lib/ubistrano/apache.rb
-    lib/ubistrano/deploy.rb
-    lib/ubistrano/ec2.rb
-    lib/ubistrano/gems.rb
-    lib/ubistrano/helpers.rb
-    lib/ubistrano/log.rb
-    lib/ubistrano/mysql.rb
-    lib/ubistrano/rails.rb
-    lib/ubistrano/sinatra.rb
-    lib/ubistrano/ssh.rb
-    lib/ubistrano/stage.rb
-    lib/ubistrano/ubuntu.rb
-    templates/apache/virtual_host.erb
-    templates/log/rotate.conf.erb
-    templates/rails/database.yml.erb
-    templates/ubuntu/apache.god.erb
-    templates/ubuntu/god.erb
-    templates/ubuntu/god.god.erb
-    templates/ubuntu/iptables.rules.erb
-    templates/ubuntu/mysql.god.erb
-    templates/ubuntu/sshd.god.erb
-    ubistrano.gemspec
-  ]
-  # = MANIFEST =
-end
+  s.extra_rdoc_files = ["README.markdown"]
+  s.files = ["bin", "bin/ubify", "changelog.markdown", "example", "example/deploy.rb", "gemspec.rb", "lib", "lib/ubistrano", "lib/ubistrano/apache.rb", "lib/ubistrano/deploy.rb", "lib/ubistrano/ec2.rb", "lib/ubistrano/gems.rb", "lib/ubistrano/helpers.rb", "lib/ubistrano/log.rb", "lib/ubistrano/mysql.rb", "lib/ubistrano/rails.rb", "lib/ubistrano/sinatra.rb", "lib/ubistrano/ssh.rb", "lib/ubistrano/stage.rb", "lib/ubistrano/ubuntu.rb", "lib/ubistrano.rb", "MIT-LICENSE", "Rakefile", "README.markdown", "templates", "templates/apache", "templates/apache/virtual_host.erb", "templates/log", "templates/log/rotate.conf.erb", "templates/rails", "templates/rails/database.yml.erb", "templates/ubuntu", "templates/ubuntu/apache.god.erb", "templates/ubuntu/god.erb", "templates/ubuntu/god.god.erb", "templates/ubuntu/iptables.rules.erb", "templates/ubuntu/mysql.god.erb", "templates/ubuntu/sshd.god.erb", "ubistrano.gemspec"]
+  s.homepage = %q{http://github.com/winton/ubistrano}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<amazon-ec2>, ["= 0.4.5"])
+    else
+      s.add_dependency(%q<amazon-ec2>, ["= 0.4.5"])
+    end
+  else
+    s.add_dependency(%q<amazon-ec2>, ["= 0.4.5"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-ubistrano
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-27 00:00:00 -07:00
-default_executable: 
+date: 2009-06-28 00:00:00 -07:00
+default_executable: ubify
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
@@ -18,26 +18,27 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.4.5
     version: 
-description: Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano
+description: 
 email: mail@wintoni.us
 executables: 
 - ubify
 extensions: []
 
-extra_rdoc_files: []
-
-files: 
-- MIT-LICENSE
+extra_rdoc_files: 
 - README.markdown
-- Rakefile
+files: 
+- bin
 - bin/ubify
 - changelog.markdown
+- example
 - example/deploy.rb
-- lib/ubistrano.rb
+- gemspec.rb
+- lib
+- lib/ubistrano
 - lib/ubistrano/apache.rb
 - lib/ubistrano/deploy.rb
 - lib/ubistrano/ec2.rb
@@ -50,9 +51,18 @@ files:
 - lib/ubistrano/ssh.rb
 - lib/ubistrano/stage.rb
 - lib/ubistrano/ubuntu.rb
+- lib/ubistrano.rb
+- MIT-LICENSE
+- Rakefile
+- README.markdown
+- templates
+- templates/apache
 - templates/apache/virtual_host.erb
+- templates/log
 - templates/log/rotate.conf.erb
+- templates/rails
 - templates/rails/database.yml.erb
+- templates/ubuntu
 - templates/ubuntu/apache.god.erb
 - templates/ubuntu/god.erb
 - templates/ubuntu/god.god.erb