Skip to content

Commit

Permalink
Rename to engineyard-serverside
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Delcambre committed Aug 16, 2010
1 parent 67eccb6 commit 12c1c88
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 23 deletions.
16 changes: 8 additions & 8 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ task :default => :spec
require 'rake/rdoctask'

$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
require 'ey-deploy'
require 'engineyard-serverside'

Rake::RDocTask.new do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = "ey-deploy #{EY::VERSION}"
rdoc.title = "engineyard-serverside #{EY::VERSION}"
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
rdoc.rdoc_files.exclude('lib/vendor/**/*.rb')
Expand All @@ -22,7 +22,7 @@ desc "Build the gem + install it on the instance: rake install_on[[user@]host]"
task :install_on, [:instance] do |t, args|
instance = args.instance

system("gem build ey-deploy.gemspec")
system("gem build engineyard-serverside.gemspec")
gem = Dir["*.gem"].last # hopefully true
abort "Failed to build gem; aborting!" unless gem
system("scp #{gem} #{instance}:")
Expand All @@ -40,7 +40,7 @@ def bump
digits.join('.') + ".pre"
end

File.open('lib/ey-deploy/version.rb', 'w') do |f|
File.open('lib/engineyard-serverside/version.rb', 'w') do |f|
f.write version_file.gsub(/_VERSION_GOES_HERE_/, new_version)
end
new_version
Expand All @@ -55,15 +55,15 @@ end
desc "Release gem"
task :release do
new_version = bump
system("git add lib/ey-deploy/version.rb")
system("git add lib/engineyard-serverside/version.rb")
system("git commit -m 'Bump version for release #{new_version}'")
system("git tag v#{new_version}")

system("gem build ey-deploy.gemspec")
system("gem build engineyard-serverside.gemspec")

load 'lib/ey-deploy/version.rb'
load 'lib/engineyard-serverside/version.rb'
bump
system("git add lib/ey-deploy/version.rb")
system("git add lib/engineyard-serverside/version.rb")
system("git commit -m 'Add .pre for next release'")

puts '********************************************************************************'
Expand Down
2 changes: 1 addition & 1 deletion bin/ey-deploy → bin/engineyard-serverside
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ rescue LoadError
end

$LOAD_PATH.push(File.expand_path("../lib", File.dirname(__FILE__)))
require 'ey-deploy'
require 'engineyard-serverside'

EY::CLI.start
8 changes: 4 additions & 4 deletions ey-deploy.gemspec → engineyard-serverside.gemspec
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
require 'bundler'
require 'ey-deploy'
require 'engineyard-serverside'

Gem::Specification.new do |s|
s.name = "ey-deploy"
s.name = "engineyard-serverside"
s.version = EY::VERSION
s.platform = Gem::Platform::RUBY
s.author = "EY Cloud Team"
Expand All @@ -13,8 +13,8 @@ Gem::Specification.new do |s|
s.summary = "A gem that deploys ruby applications on EY Cloud instances"

s.files = Dir.glob("{bin,lib}/**/*") + %w(LICENSE)
s.executables = ["ey-deploy"]
s.default_executable = "ey-deploy"
s.executables = ["engineyard-serverside"]
s.default_executable = "engineyard-serverside"
s.require_path = 'lib'

s.rubygems_version = %q{1.3.6}
Expand Down
2 changes: 1 addition & 1 deletion lib/ey-deploy.rb → lib/engineyard-serverside.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$LOAD_PATH.push(File.expand_path("ey-deploy", File.dirname(__FILE__)))
$LOAD_PATH.push(File.expand_path("engineyard-serverside", File.dirname(__FILE__)))
$LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
$LOAD_PATH.unshift File.expand_path('vendor/open4/lib', File.dirname(__FILE__))
$LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions lib/ey-deploy/cli.rb → lib/engineyard-serverside/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ def install_bundler(version)
end
end

desc "propagate", "Propagate the ey-deploy gem to the other instances in the cluster. This will install exactly version #{VERSION} and remove other versions if found."
desc "propagate", "Propagate the engineyard-serverside gem to the other instances in the cluster. This will install exactly version #{VERSION} and remove other versions if found."
def propagate
config = EY::Deploy::Configuration.new
gem_filename = "ey-deploy-#{VERSION}.gem"
gem_filename = "engineyard-serverside-#{VERSION}.gem"
local_gem_file = File.join(Gem.dir, 'cache', gem_filename)
remote_gem_file = File.join(Dir.tmpdir, gem_filename)
gem_binary = File.join(Gem.default_bindir, 'gem')
Expand All @@ -116,10 +116,10 @@ def propagate
egrep_escaped_version = VERSION.gsub(/\./, '\.')
# the [,)] is to stop us from looking for e.g. 0.5.1, seeing
# 0.5.11, and mistakenly thinking 0.5.1 is there
has_gem_cmd = "#{gem_binary} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{egrep_escaped_version}[,)]'"
has_gem_cmd = "#{gem_binary} list engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{egrep_escaped_version}[,)]'"

if !server.run(has_gem_cmd) # doesn't have this exact version
puts "~> Installing ey-deploy on #{server.hostname}"
puts "~> Installing engineyard-serverside on #{server.hostname}"

system(Escape.shell_command([
'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,3 @@ def on_roles(desired_roles)

end
end

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'open-uri'
require 'ey-deploy/logged_output'
require 'engineyard-serverside/logged_output'

module EY
class Server < Struct.new(:hostname, :role, :name)
Expand Down Expand Up @@ -68,4 +68,3 @@ def ssh_command
end
end
end

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'ey-deploy/logged_output'
require 'engineyard-serverside/logged_output'

module EY
module Strategies
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Bundler.require :default, :test
require 'pp'
require 'ey-deploy'
require 'engineyard-serverside'

module EY
def self.dna_json=(j)
Expand Down

0 comments on commit 12c1c88

Please sign in to comment.