From d582223028a0a46e65ab186634fcda85bee53941 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Wed, 23 Jul 2014 13:10:25 -0400 Subject: [PATCH] omnibus-ruby -> omnibus --- CHANGELOG.md | 32 +++++++++---------- NOTICE | 9 ------ README.md | 10 +++--- omnibus.gemspec | 8 ++--- .../complicated/config/software/cacerts.rb | 6 ++-- .../config/software/chef-windows.rb | 4 +-- spec/data/complicated/config/software/chef.rb | 4 +-- .../complicated/config/software/chefdk.rb | 2 +- .../complicated/config/software/openssl.rb | 2 +- spec/data/complicated/config/software/ruby.rb | 2 +- 10 files changed, 35 insertions(+), 44 deletions(-) delete mode 100644 NOTICE diff --git a/CHANGELOG.md b/CHANGELOG.md index f58727e6f..b5cce32ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -323,22 +323,22 @@ BUG FIXES: - The initial release. -[#63]: https://github.com/opscode/omnibus-ruby/issues/63 -[#67]: https://github.com/opscode/omnibus-ruby/issues/67 -[#70]: https://github.com/opscode/omnibus-ruby/issues/70 -[#71]: https://github.com/opscode/omnibus-ruby/issues/71 -[#72]: https://github.com/opscode/omnibus-ruby/issues/72 -[#73]: https://github.com/opscode/omnibus-ruby/issues/73 -[#74]: https://github.com/opscode/omnibus-ruby/issues/74 -[#77]: https://github.com/opscode/omnibus-ruby/issues/77 -[#78]: https://github.com/opscode/omnibus-ruby/issues/78 -[#79]: https://github.com/opscode/omnibus-ruby/issues/79 -[#80]: https://github.com/opscode/omnibus-ruby/issues/80 -[#81]: https://github.com/opscode/omnibus-ruby/issues/81 -[#82]: https://github.com/opscode/omnibus-ruby/issues/82 -[#83]: https://github.com/opscode/omnibus-ruby/issues/83 -[#85]: https://github.com/opscode/omnibus-ruby/issues/85 -[#86]: https://github.com/opscode/omnibus-ruby/issues/86 +[#63]: https://github.com/opscode/omnibus/issues/63 +[#67]: https://github.com/opscode/omnibus/issues/67 +[#70]: https://github.com/opscode/omnibus/issues/70 +[#71]: https://github.com/opscode/omnibus/issues/71 +[#72]: https://github.com/opscode/omnibus/issues/72 +[#73]: https://github.com/opscode/omnibus/issues/73 +[#74]: https://github.com/opscode/omnibus/issues/74 +[#77]: https://github.com/opscode/omnibus/issues/77 +[#78]: https://github.com/opscode/omnibus/issues/78 +[#79]: https://github.com/opscode/omnibus/issues/79 +[#80]: https://github.com/opscode/omnibus/issues/80 +[#81]: https://github.com/opscode/omnibus/issues/81 +[#82]: https://github.com/opscode/omnibus/issues/82 +[#83]: https://github.com/opscode/omnibus/issues/83 +[#85]: https://github.com/opscode/omnibus/issues/85 +[#86]: https://github.com/opscode/omnibus/issues/86 [@benjaminws]: https://github.com/benjaminws [@christophergeers]: https://github.com/christophergeers [@christophermaier]: https://github.com/christophermaier diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 75bf74585..000000000 --- a/NOTICE +++ /dev/null @@ -1,9 +0,0 @@ -omnibus-ruby NOTICE -=================== - -Developed at Chef Software, Inc (http://www.getchef.com). - -Contributors and Copyright holders: - - * Copyright 2012-2014, Chef Software, Inc. - diff --git a/README.md b/README.md index 57fb2d927..99d3cad41 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ ![Omnibus Icon](lib/omnibus/assets/README-logo.png) Omnibus =========================================================== [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem] -[![Build Status](http://img.shields.io/travis/opscode/omnibus-ruby.svg)][travis] +[![Build Status](http://img.shields.io/travis/opscode/omnibus.svg)][travis] [gem]: https://rubygems.org/gems/omnibus -[travis]: http://travis-ci.org/opscode/omnibus-ruby +[travis]: http://travis-ci.org/opscode/omnibus Easily create full-stack installers for your project across a variety of platforms. @@ -81,7 +81,7 @@ s3_secret_key ENV['S3_SECRET_KEY'] s3_bucket ENV['S3_BUCKET'] ``` -For more information, please see the [`Config` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Config). +For more information, please see the [`Config` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Config). You can tell Omnibus to load a difference configuration file by passing the `--config` option to any command: @@ -122,7 +122,7 @@ Some DSL methods available include: | `build_iteration` | The package iteration number | | `dependency` | An Omnibus software-defined component to include in this package | -For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Project). +For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project). ### Software @@ -183,7 +183,7 @@ end Since the software definitions are simply ruby code, you can conditionally execute anything by wrapping it with pure Ruby that tests for the version number. -For more DSL methods, please consult the [`Software` documentation](http://rubydoc.info/github/opscode/omnibus-ruby/Omnibus/Software). +For more DSL methods, please consult the [`Software` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Software). #### Sharing software definitions The easiest way to share organization-wide software is via bundler and Rubygems. For an example software repository, look at Chef's [omnibus-software](https://github.com/opscode/omnibus-software). For more information, please see the [Rubygems documentation](http://guides.rubygems.org/publishing/). diff --git a/omnibus.gemspec b/omnibus.gemspec index 77ebfef80..76d2f0fdf 100644 --- a/omnibus.gemspec +++ b/omnibus.gemspec @@ -8,10 +8,10 @@ Gem::Specification.new do |gem| gem.version = Omnibus::VERSION gem.license = 'Apache 2.0' gem.author = 'Chef Software, Inc.' - gem.email = 'info@getchef.com' - gem.description = 'Omnibus helps you build self-installing, full-stack software builds.' - gem.summary = gem.description - gem.homepage = 'https://github.com/opscode/omnibus-ruby' + gem.email = 'releng@getchef.com' + gem.summary = 'Omnibus is a framework for building self-installing, full-stack software builds.' + gem.description = gem.summary + gem.homepage = 'https://github.com/opscode/omnibus' gem.required_ruby_version = '>= 1.9.1' diff --git a/spec/data/complicated/config/software/cacerts.rb b/spec/data/complicated/config/software/cacerts.rb index e6f974710..0657db9bb 100644 --- a/spec/data/complicated/config/software/cacerts.rb +++ b/spec/data/complicated/config/software/cacerts.rb @@ -27,10 +27,10 @@ block do FileUtils.mkdir_p(File.expand_path("embedded/ssl/certs", install_dir)) - # There is a bug in omnibus-ruby that may or may not have been fixed. Since the source url - # does not point to an archive, omnibus-ruby tries to copy cacert.pem into the project working + # There is a bug in omnibus that may or may not have been fixed. Since the source url + # does not point to an archive, omnibus tries to copy cacert.pem into the project working # directory. However, it fails and copies to '/var/cache/omnibus/src/cacerts-2012.12.19\' instead - # There is supposed to be a fix in omnibus-ruby, but under further testing, it was unsure if the + # There is supposed to be a fix in omnibus, but under further testing, it was unsure if the # fix worked. Rather than trying to fix this now, we're filing a bug and copying the cacert.pem # directly from the cache instead. diff --git a/spec/data/complicated/config/software/chef-windows.rb b/spec/data/complicated/config/software/chef-windows.rb index 2ad750f8a..6937f814b 100644 --- a/spec/data/complicated/config/software/chef-windows.rb +++ b/spec/data/complicated/config/software/chef-windows.rb @@ -36,11 +36,11 @@ # ##################################################################### # - # since omnibus-ruby is not architected to intentionally let the + # since omnibus is not architected to intentionally let the # software definitions define the #build_version and # #build_iteration of the package artifact, we're going to implement # a temporary hack here that lets us do so. this type of use case - # will become a feature of omnibus-ruby in the future, but in order + # will become a feature of omnibus in the future, but in order # to get things shipped, we'll hack it up here. # # <3 Stephen diff --git a/spec/data/complicated/config/software/chef.rb b/spec/data/complicated/config/software/chef.rb index c3bb1ab92..1af9986e7 100644 --- a/spec/data/complicated/config/software/chef.rb +++ b/spec/data/complicated/config/software/chef.rb @@ -57,11 +57,11 @@ # ##################################################################### # - # since omnibus-ruby is not architected to intentionally let the + # since omnibus is not architected to intentionally let the # software definitions define the #build_version and # #build_iteration of the package artifact, we're going to implement # a temporary hack here that lets us do so. this type of use case - # will become a feature of omnibus-ruby in the future, but in order + # will become a feature of omnibus in the future, but in order # to get things shipped, we'll hack it up here. # # <3 Stephen diff --git a/spec/data/complicated/config/software/chefdk.rb b/spec/data/complicated/config/software/chefdk.rb index 723af5dae..218b19b5f 100644 --- a/spec/data/complicated/config/software/chefdk.rb +++ b/spec/data/complicated/config/software/chefdk.rb @@ -48,7 +48,7 @@ build do # Nasty hack to set the artifact version until this gets fixed: - # https://github.com/opscode/omnibus-ruby/issues/134 + # https://github.com/opscode/omnibus/issues/134 block do project = self.project if project.name == "chefdk" diff --git a/spec/data/complicated/config/software/openssl.rb b/spec/data/complicated/config/software/openssl.rb index 5fc48e765..81d3d2afb 100644 --- a/spec/data/complicated/config/software/openssl.rb +++ b/spec/data/complicated/config/software/openssl.rb @@ -140,7 +140,7 @@ # openssl build process uses a `makedepend` tool that we build inside the bundle. env["PATH"] = "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + ENV["PATH"] - # @todo: move into omnibus-ruby + # @todo: move into omnibus has_gmake = system("gmake --version") if has_gmake diff --git a/spec/data/complicated/config/software/ruby.rb b/spec/data/complicated/config/software/ruby.rb index 301588d15..444c49dd7 100644 --- a/spec/data/complicated/config/software/ruby.rb +++ b/spec/data/complicated/config/software/ruby.rb @@ -146,7 +146,7 @@ "GEM_HOME" => nil }) - # @todo: move into omnibus-ruby + # @todo: move into omnibus has_gmake = system("gmake --version") if has_gmake