Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

stripped out the old cluster-chef stuff from gemspec and rakefile

  • Loading branch information...
commit 0074196930270d61b3134196339d9d891c53f6d7 1 parent 812e782
Philip (flip) Kromer authored
View
54 Rakefile
@@ -18,8 +18,6 @@
# limitations under the License.
#
-DEPRECATED_NAME = "!! This gem has been renamed 'ironfan' (from cluster_chef). \n It will not be updated after Feb. 2012. \n Sorry for the inconvenience."
-
require 'rubygems' unless defined?(Gem)
require 'bundler'
begin
@@ -43,41 +41,25 @@ Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
# Jeweler -- release ironfan as a gem
#
-gems_to_release = ENV['GEMS_TO_RELEASE'] ? ENV['GEMS_TO_RELEASE'].split : %w[ ironfan ]
-gems_to_release.each do |gem_name|
- Jeweler::Tasks.new do |gem|
- gem.name = gem_name
- gem.homepage = "http://infochimps.com/labs"
- gem.license = NEW_COOKBOOK_LICENSE.to_s
- gem.summary = %Q{#{gem_name} allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
- gem.description = %Q{#{gem_name} allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
- gem.email = SSL_EMAIL_ADDRESS
- gem.authors = ["Infochimps"]
-
- ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
- dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
- gem.files = dotfiles + Dir["**/*"].
- reject{|f| f =~ %r{^cookbooks/} }.
- reject{|f| File.directory?(f) }.
- reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
- gem.test_files = gem.files.grep(/^spec\//)
- gem.require_paths = ['lib']
+Jeweler::Tasks.new do |gem|
+ gem.name = 'ironfan'
+ gem.homepage = "http://infochimps.com/labs"
+ gem.license = NEW_COOKBOOK_LICENSE.to_s
+ gem.summary = %Q{Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
+ gem.description = %Q{Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
+ gem.email = SSL_EMAIL_ADDRESS
+ gem.authors = ["Infochimps"]
- if gem.name == 'cluster_chef'
- gem.files.reject!{|f| f =~ %r{^(cluster_chef-knife.gemspec|lib/chef/knife/)} }
- gem.add_runtime_dependency 'cluster_chef-knife', "= #{File.read('VERSION').strip}"
- gem.post_install_message = DEPRECATED_NAME
- elsif gem.name == 'cluster_chef-knife'
- gem.files.reject!{|f| f =~ %r{^(cluster_chef.gemspec|lib/cluster_chef)} }
- gem.post_install_message = DEPRECATED_NAME
- elsif gem.name == 'ironfan'
- true # pass
- else
- raise "Don't know what to include for gem #{gem.name}"
- end
- end
- Jeweler::RubygemsDotOrgTasks.new
+ ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
+ dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
+ gem.files = dotfiles + Dir["**/*"].
+ reject{|f| f =~ %r{^cookbooks/} }.
+ reject{|f| File.directory?(f) }.
+ reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
+ gem.test_files = gem.files.grep(/^spec\//)
+ gem.require_paths = ['lib']
end
+Jeweler::RubygemsDotOrgTasks.new
# ---------------------------------------------------------------------------
#
@@ -98,6 +80,8 @@ end
# Yard -- documentation
#
YARD::Rake::YardocTask.new
+desc "Alias for 'rake yard'"
+task :doc => :yard
# ---------------------------------------------------------------------------
View
122 cluster_chef-knife.gemspec
@@ -1,122 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = "cluster_chef-knife"
- s.version = "3.1.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Infochimps"]
- s.date = "2012-02-18"
- s.description = "cluster_chef-knife allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
- s.email = "coders@infochimps.com"
- s.extra_rdoc_files = [
- "LICENSE.md",
- "README.md"
- ]
- s.files = [
- ".gitignore",
- ".rspec",
- "CHANGELOG.md",
- "Gemfile",
- "LICENSE.md",
- "README.md",
- "Rakefile",
- "TODO.md",
- "VERSION",
- "chefignore",
- "cluster_chef-knife.gemspec",
- "config/client.rb",
- "config/proxy.pac",
- "config/ubuntu10.04-ironfan.erb",
- "config/ubuntu11.10-ironfan.erb",
- "ironfan.gemspec",
- "lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb",
- "lib/chef/knife/bootstrap/ubuntu11.10-ironfan.erb",
- "lib/chef/knife/cluster_bootstrap.rb",
- "lib/chef/knife/cluster_kick.rb",
- "lib/chef/knife/cluster_kill.rb",
- "lib/chef/knife/cluster_launch.rb",
- "lib/chef/knife/cluster_list.rb",
- "lib/chef/knife/cluster_proxy.rb",
- "lib/chef/knife/cluster_show.rb",
- "lib/chef/knife/cluster_ssh.rb",
- "lib/chef/knife/cluster_start.rb",
- "lib/chef/knife/cluster_stop.rb",
- "lib/chef/knife/cluster_sync.rb",
- "lib/chef/knife/ironfan_script.rb",
- "lib/chef/knife/ironfan_knife_common.rb",
- "lib/ironfan.rb",
- "lib/ironfan/chef_layer.rb",
- "lib/ironfan/cloud.rb",
- "lib/ironfan/cluster.rb",
- "lib/ironfan/compute.rb",
- "lib/ironfan/deprecated.rb",
- "lib/ironfan/discovery.rb",
- "lib/ironfan/dsl_object.rb",
- "lib/ironfan/facet.rb",
- "lib/ironfan/fog_layer.rb",
- "lib/ironfan/private_key.rb",
- "lib/ironfan/role_implications.rb",
- "lib/ironfan/security_group.rb",
- "lib/ironfan/server.rb",
- "lib/ironfan/server_slice.rb",
- "lib/ironfan/volume.rb",
- "rspec.watchr",
- "spec/ironfan/cluster_spec.rb",
- "spec/ironfan/facet_spec.rb",
- "spec/ironfan/server_slice_spec.rb",
- "spec/ironfan/server_spec.rb",
- "spec/ironfan_spec.rb",
- "spec/spec_helper.rb",
- "spec/spec_helper/dummy_chef.rb",
- "spec/test_config.rb",
- "tasks/chef_config.rake",
- "tasks/jeweler_use_alt_branch.rake"
- ]
- s.homepage = "http://infochimps.com/labs"
- s.licenses = ["apachev2"]
- s.post_install_message = "!! This gem has been renamed 'ironfan' (from cluster_chef). \n It will not be updated after Feb. 2012. \n Sorry for the inconvenience."
- s.require_paths = ["lib"]
- s.rubygems_version = "1.8.15"
- s.summary = "cluster_chef-knife allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
- s.test_files = ["spec/ironfan/cluster_spec.rb", "spec/ironfan/facet_spec.rb", "spec/ironfan/server_slice_spec.rb", "spec/ironfan/server_spec.rb", "spec/ironfan_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
-
- if s.respond_to? :specification_version then
- s.specification_version = 3
-
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_runtime_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_runtime_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_runtime_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_development_dependency(%q<bundler>, ["~> 1"])
- s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_development_dependency(%q<rspec>, ["~> 2.5"])
- s.add_development_dependency(%q<yard>, ["~> 0.6"])
- s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
- else
- s.add_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 2.5"])
- s.add_dependency(%q<yard>, ["~> 0.6"])
- s.add_dependency(%q<configliere>, ["~> 0.4.8"])
- end
- else
- s.add_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 2.5"])
- s.add_dependency(%q<yard>, ["~> 0.6"])
- s.add_dependency(%q<configliere>, ["~> 0.4.8"])
- end
-end
View
111 cluster_chef.gemspec
@@ -1,111 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = "cluster_chef"
- s.version = "3.1.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Infochimps"]
- s.date = "2012-02-18"
- s.description = "cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
- s.email = "coders@infochimps.com"
- s.extra_rdoc_files = [
- "LICENSE.md",
- "README.md"
- ]
- s.files = [
- ".gitignore",
- ".rspec",
- "CHANGELOG.md",
- "Gemfile",
- "LICENSE.md",
- "README.md",
- "Rakefile",
- "TODO.md",
- "VERSION",
- "chefignore",
- "cluster_chef.gemspec",
- "config/client.rb",
- "config/proxy.pac",
- "config/ubuntu10.04-ironfan.erb",
- "config/ubuntu11.10-ironfan.erb",
- "ironfan.gemspec",
- "lib/ironfan.rb",
- "lib/ironfan/chef_layer.rb",
- "lib/ironfan/cloud.rb",
- "lib/ironfan/cluster.rb",
- "lib/ironfan/compute.rb",
- "lib/ironfan/deprecated.rb",
- "lib/ironfan/discovery.rb",
- "lib/ironfan/dsl_object.rb",
- "lib/ironfan/facet.rb",
- "lib/ironfan/fog_layer.rb",
- "lib/ironfan/private_key.rb",
- "lib/ironfan/role_implications.rb",
- "lib/ironfan/security_group.rb",
- "lib/ironfan/server.rb",
- "lib/ironfan/server_slice.rb",
- "lib/ironfan/volume.rb",
- "rspec.watchr",
- "spec/ironfan/cluster_spec.rb",
- "spec/ironfan/facet_spec.rb",
- "spec/ironfan/server_slice_spec.rb",
- "spec/ironfan/server_spec.rb",
- "spec/ironfan_spec.rb",
- "spec/spec_helper.rb",
- "spec/spec_helper/dummy_chef.rb",
- "spec/test_config.rb",
- "tasks/chef_config.rake",
- "tasks/jeweler_use_alt_branch.rake"
- ]
- s.homepage = "http://infochimps.com/labs"
- s.licenses = ["apachev2"]
- s.post_install_message = "!! This gem has been renamed 'ironfan' (from cluster_chef). \n It will not be updated after Feb. 2012. \n Sorry for the inconvenience."
- s.require_paths = ["lib"]
- s.rubygems_version = "1.8.15"
- s.summary = "cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
- s.test_files = ["spec/ironfan/cluster_spec.rb", "spec/ironfan/facet_spec.rb", "spec/ironfan/server_slice_spec.rb", "spec/ironfan/server_spec.rb", "spec/ironfan_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
-
- if s.respond_to? :specification_version then
- s.specification_version = 3
-
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_runtime_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_runtime_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_runtime_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_development_dependency(%q<bundler>, ["~> 1"])
- s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_development_dependency(%q<rspec>, ["~> 2.5"])
- s.add_development_dependency(%q<yard>, ["~> 0.6"])
- s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
- s.add_runtime_dependency(%q<cluster_chef-knife>, ["= 3.1.0"])
- else
- s.add_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 2.5"])
- s.add_dependency(%q<yard>, ["~> 0.6"])
- s.add_dependency(%q<configliere>, ["~> 0.4.8"])
- s.add_dependency(%q<cluster_chef-knife>, ["= 3.1.0"])
- end
- else
- s.add_dependency(%q<chef>, ["~> 0.10.4"])
- s.add_dependency(%q<fog>, ["~> 1.1.1"])
- s.add_dependency(%q<formatador>, ["~> 0.2.1"])
- s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6"])
- s.add_dependency(%q<rspec>, ["~> 2.5"])
- s.add_dependency(%q<yard>, ["~> 0.6"])
- s.add_dependency(%q<configliere>, ["~> 0.4.8"])
- s.add_dependency(%q<cluster_chef-knife>, ["= 3.1.0"])
- end
-end
-
View
9 ironfan.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Infochimps"]
s.date = "2012-02-24"
- s.description = "ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
+ s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
s.email = "coders@infochimps.com"
s.extra_rdoc_files = [
"LICENSE.md",
@@ -29,8 +29,6 @@ Gem::Specification.new do |s|
"TODO.md",
"VERSION",
"chefignore",
- "cluster_chef-knife.gemspec",
- "cluster_chef.gemspec",
"config/client.rb",
"config/proxy.pac",
"config/ubuntu10.04-ironfan.erb",
@@ -107,14 +105,13 @@ Gem::Specification.new do |s|
"spec/spec_helper.rb",
"spec/spec_helper/dummy_chef.rb",
"spec/test_config.rb",
- "tasks/chef_config.rake",
- "tasks/jeweler_use_alt_branch.rake"
+ "tasks/chef_config.rake"
]
s.homepage = "http://infochimps.com/labs"
s.licenses = ["apachev2"]
s.require_paths = ["lib"]
s.rubygems_version = "1.8.15"
- s.summary = "ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
+ s.summary = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
s.test_files = ["spec/ironfan/cluster_spec.rb", "spec/ironfan/facet_spec.rb", "spec/ironfan/server_slice_spec.rb", "spec/ironfan/server_spec.rb", "spec/ironfan_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
if s.respond_to? :specification_version then
View
53 tasks/jeweler_use_alt_branch.rake
@@ -1,53 +0,0 @@
-
-#
-# Jeweler has hardcoded the 'master' branch as where to push from.
-# We hardcode it right back in.
-#
-
-module Jeweler::Commands
-
- PUSH_FROM_BRANCH = 'master' unless defined?(PUSH_FROM_BRANCH)
-
- ReleaseToGit.class_eval do
- def run
- branch = PUSH_FROM_BRANCH
- remote = 'origin'
-
- unless clean_staging_area?
- system "git status"
- raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
- end
-
- repo.checkout(branch)
- repo.push(remote, branch)
-
- if release_not_tagged?
- output.puts "Tagging #{release_tag}"
- repo.add_tag(release_tag)
-
- output.puts "Pushing #{release_tag} to origin"
- repo.push('origin', release_tag)
- end
- end
- end
-
- ReleaseGemspec.class_eval do
- def run
- branch = PUSH_FROM_BRANCH
- remote = 'origin'
-
- unless clean_staging_area?
- system "git status"
- raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
- end
-
- repo.checkout(branch)
-
- regenerate_gemspec!
- commit_gemspec! if gemspec_changed?
-
- output.puts "Pushing #{branch} to origin"
- repo.push(remote, branch)
- end
- end
-end
Please sign in to comment.
Something went wrong with that request. Please try again.