rename chef-binstubs -> chef-bin

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

19 files changed, 25 insertions, 25 deletions

diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index d152883dc4..85f7340811 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -12,7 +12,7 @@
 set -evx
 
 sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config/lib/chef-config/version.rb
-sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-binstubs/lib/chef-binstubs/version.rb
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-bin/lib/chef-bin/version.rb
 sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb
 
 # Update the version inside Gemfile.lock
diff --git a/.gitignore b/.gitignore
index eda6f55de7..d88442ba7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,7 @@ chef-config/.bundle
 chef-config/Gemfile.lock
 chef-config/pkg
 
-# chef-binstubs
-chef-binstubs/.bundle
-chef-binstubs/Gemfile.lock
-chef-binstubs/pkg
+# chef-bin
+chef-bin/.bundle
+chef-bin/Gemfile.lock
+chef-bin/pkg
diff --git a/Gemfile b/Gemfile
index 56c779e84b..71a3efd2a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "chef", path: "."
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
 
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
-gem "chef-binstubs", path: File.expand_path("../chef-binstubs", __FILE__) if File.exist?(File.expand_path("../chef-binstubs", __FILE__))
+gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__) if File.exist?(File.expand_path("../chef-bin", __FILE__))
 gem "cheffish", "~> 14"
 
 group(:omnibus_package) do
diff --git a/Gemfile.lock b/Gemfile.lock
index 66a737f651..2340786ec0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 6738400472b2793ffa070d35959cd06d86b7fdb0
+  revision: a1ec73298d623d18cbe05c2b53ac57c8cc9beae0
   branch: master
   specs:
     ohai (15.0.34)
@@ -99,9 +99,9 @@ PATH
       wmi-lite (~> 1.0)
 
 PATH
-  remote: chef-binstubs
+  remote: chef-bin
   specs:
-    chef-binstubs (15.0.233)
+    chef-bin (15.0.233)
       chef (= 15.0.233)
 
 PATH
@@ -229,7 +229,7 @@ GEM
     jaro_winkler (1.5.2)
     json (2.2.0)
     libyajl2 (1.2.0)
-    license-acceptance (0.2.13)
+    license-acceptance (0.2.16)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
@@ -423,7 +423,7 @@ GEM
     win32-taskscheduler (2.0.4)
       ffi
       structured_warnings
-    winrm (2.3.1)
+    winrm (2.3.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -450,7 +450,7 @@ DEPENDENCIES
   appbundler
   bcrypt_pbkdf
   chef!
-  chef-binstubs!
+  chef-bin!
   chef-config!
   chef-vault
   cheffish (~> 14)
diff --git a/Rakefile b/Rakefile
index c0520a8f5f..d9c3c397da 100644
--- a/Rakefile
+++ b/Rakefile
@@ -36,8 +36,8 @@ Bundler::GemHelper.install_tasks name: gemspec
 
 # this gets appended to the normal bundler install helper
 task :install do
-  chef_binstubs_path = ::File.join(::File.dirname(__FILE__), "chef-binstubs")
-  Dir.chdir(chef_binstubs_path)
+  chef_bin_path = ::File.join(::File.dirname(__FILE__), "chef-bin")
+  Dir.chdir(chef_bin_path)
   sh("rake install:force")
 end
 
diff --git a/chef-binstubs/.rspec b/chef-bin/.rspec
index eb3ef03653..eb3ef03653 100644
--- a/chef-binstubs/.rspec
+++ b/chef-bin/.rspec
diff --git a/chef-binstubs/Gemfile b/chef-bin/Gemfile
index 96ab544690..96ab544690 100644
--- a/chef-binstubs/Gemfile
+++ b/chef-bin/Gemfile
diff --git a/chef-binstubs/LICENSE b/chef-bin/LICENSE
index 11069edd79..11069edd79 100644
--- a/chef-binstubs/LICENSE
+++ b/chef-bin/LICENSE
diff --git a/chef-binstubs/Rakefile b/chef-bin/Rakefile
index 100f923553..5626d1bc5d 100644
--- a/chef-binstubs/Rakefile
+++ b/chef-bin/Rakefile
@@ -5,10 +5,10 @@ Bundler::GemHelper.install_tasks
 
 # this is necessary to use to overwrite any chef-14 or earlier era gem which has the bin files in
 # the chef gem itself
-desc "force install the chef-binstubs gem"
+desc "force install the chef-bin gem"
 task "install:force" do
-  sh "gem build -V chef-binstubs.gemspec"
-  built_gem_path = Dir["chef-binstubs-*.gem"].sort_by { |f| File.mtime(f) }.last
+  sh "gem build -V chef-bin.gemspec"
+  built_gem_path = Dir["chef-bin-*.gem"].sort_by { |f| File.mtime(f) }.last
   FileUtils.mkdir_p("pkg") unless Dir.exist?("pkg")
   FileUtils.mv(built_gem_path, "pkg")
   sh "gem install -f pkg/#{built_gem_path}"
diff --git a/chef-binstubs/bin/chef-apply b/chef-bin/bin/chef-apply
index ddbdc66907..ddbdc66907 100755
--- a/chef-binstubs/bin/chef-apply
+++ b/chef-bin/bin/chef-apply
diff --git a/chef-binstubs/bin/chef-client b/chef-bin/bin/chef-client
index af27d7903d..af27d7903d 100755
--- a/chef-binstubs/bin/chef-client
+++ b/chef-bin/bin/chef-client
diff --git a/chef-binstubs/bin/chef-resource-inspector b/chef-bin/bin/chef-resource-inspector
index 6a7eac0c32..6a7eac0c32 100755
--- a/chef-binstubs/bin/chef-resource-inspector
+++ b/chef-bin/bin/chef-resource-inspector
diff --git a/chef-binstubs/bin/chef-service-manager b/chef-bin/bin/chef-service-manager
index 9021824fed..9021824fed 100755
--- a/chef-binstubs/bin/chef-service-manager
+++ b/chef-bin/bin/chef-service-manager
diff --git a/chef-binstubs/bin/chef-shell b/chef-bin/bin/chef-shell
index 666ce1944c..666ce1944c 100755
--- a/chef-binstubs/bin/chef-shell
+++ b/chef-bin/bin/chef-shell
diff --git a/chef-binstubs/bin/chef-solo b/chef-bin/bin/chef-solo
index 06c0452d26..06c0452d26 100755
--- a/chef-binstubs/bin/chef-solo
+++ b/chef-bin/bin/chef-solo
diff --git a/chef-binstubs/bin/chef-windows-service b/chef-bin/bin/chef-windows-service
index 646e3b4a93..646e3b4a93 100755
--- a/chef-binstubs/bin/chef-windows-service
+++ b/chef-bin/bin/chef-windows-service
diff --git a/chef-binstubs/chef-binstubs.gemspec b/chef-bin/chef-bin.gemspec
index 202c49bafa..4f327914bd 100644
--- a/chef-binstubs/chef-binstubs.gemspec
+++ b/chef-bin/chef-bin.gemspec
@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "chef-binstubs/version"
+require "chef-bin/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "chef-binstubs"
-  spec.version       = ChefBinstubs::VERSION
+  spec.name          = "chef-bin"
+  spec.version       = ChefBin::VERSION
   spec.authors       = ["Adam Jacob"]
   spec.email         = ["adam@chef.io"]
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "chef", "= #{ChefBinstubs::VERSION}"
+  spec.add_dependency "chef", "= #{ChefBin::VERSION}"
   spec.add_development_dependency "rake"
 
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
diff --git a/chef-binstubs/lib/chef-binstubs.rb b/chef-bin/lib/chef-bin.rb
index da9a5f32d7..b40bf9fa11 100644
--- a/chef-binstubs/lib/chef-binstubs.rb
+++ b/chef-bin/lib/chef-bin.rb
@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,6 @@
 # limitations under the License.
 #
 
-module ChefBinstubs
+module ChefBin
 
 end
diff --git a/chef-binstubs/lib/chef-binstubs/version.rb b/chef-bin/lib/chef-bin/version.rb
index e471830530..a74952b171 100644
--- a/chef-binstubs/lib/chef-binstubs/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -19,8 +19,8 @@
 # task instead.
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-module ChefBinstubs
-  CHEFBINSTUBS_ROOT = File.expand_path("../..", __FILE__)
+module ChefBin
+  CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
   VERSION = "15.0.233".freeze
 end