boucher 0.1.3 → 0.1.4

data/boucher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "boucher"
-  s.version     = "0.1.3"
+  s.version     = "0.1.4"
   s.authors     = ["'Micah Micah'"]
   s.email       = ["'micah@8thlight.com'"]
   s.homepage    = "http://github.com/8thlight/boucher"

data/lib/boucher/compute.rb

@@ -45,7 +45,7 @@ module Boucher
 
   def self.cook_meal(server, meal_name)
     update_recipes(server)
-    ssh server, "cd infrastructure && sudo BUTCHER_ENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j config/#{meal_name}.json"
+    ssh server, "cd infrastructure && sudo BENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j config/#{meal_name}.json"
   end
 
   def self.ssh_open?(server)

data/lib/boucher/env.rb

@@ -5,7 +5,7 @@ module Boucher
   } unless defined?(Boucher::Config)
 
   def self.env_name
-    ENV["BUTCHER_ENV"] ? ENV["BUTCHER_ENV"] : :dev
+    ENV["BENV"] ? ENV["BENV"] : :dev
   end
 
   env_dir = File.expand_path("config/env")
@@ -14,7 +14,7 @@ module Boucher
 
   unless defined?(Boucher::NO_LOAD_CONFIG)
     unless File.exists?(env_path)
-      raise "Config file #{env_path} doesn't exist.\nYou need to change your BUTCHER_ENV environment variable to a valid environment name.\nValid environments: #{valid_envs.join(", ")}"
+      raise "Config file #{env_path} doesn't exist.\nYou need to change your BENV environment variable to a valid environment name.\nValid environments: #{valid_envs.join(", ")}"
     end
 
     load env_path
@@ -35,8 +35,8 @@ module Boucher
   end
 
   def self.assert_env!
-    unless ENV['BUTCHER_ENV']
-      raise 'BUTCHER_ENV must be set before running this command'
+    unless ENV['BENV']
+      raise 'BENV must be set before running this command'
     end
   end
 end

data/lib/boucher/tasks/servers.rake

@@ -104,7 +104,7 @@ web console and click Instance Actions -> Change Termination Protection -> Yes."
 
   desc "Provision new, or chef existing server of the specified meal"
   task :establish, [:meal] do |t, args|
-    server = Boucher.find_server(args.meal, ENV['BUTCHER_ENV'])
+    server = Boucher.find_server(args.meal, ENV['BENV'])
     Boucher.establish_server(server, args.meal)
   end
 

data/spec/boucher/compute_spec.rb

@@ -44,7 +44,7 @@ describe "Boucher Cloud" do
     server = OpenStruct.new(:id => "test_id")
 
     Boucher.should_receive(:update_recipes).with(server)
-    Boucher.should_receive(:ssh).with(server, "cd infrastructure && sudo BUTCHER_ENV=env_name BRANCH=branch_name chef-solo -c config/solo.rb -j config/meal_name.json")
+    Boucher.should_receive(:ssh).with(server, "cd infrastructure && sudo BENV=env_name BRANCH=branch_name chef-solo -c config/solo.rb -j config/meal_name.json")
     Boucher::Config[:branch] = "branch_name"
     Boucher::Config[:env] = "env_name"
 

data/spec/boucher/env_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe "Environment" do
   describe "env" do
     before do
-      @old_env = ENV['BUTCHER_ENV']
+      @old_env = ENV['BENV']
     end
 
     after do
-      ENV['BUTCHER_ENV'] = @old_env
+      ENV['BENV'] = @old_env
     end
 
     it "defaults to :dev" do
-      ENV.delete('BUTCHER_ENV')
+      ENV.delete('BENV')
       #load File.expand_path(File.dirname(__FILE__) + "/../../lib/boucher/env.rb")
       Boucher::env_name.should == :dev
     end
 
     it "can be set via an environment variable" do
-      ENV['BUTCHER_ENV'] = "ci"
+      ENV['BENV'] = "ci"
       load File.expand_path(File.dirname(__FILE__) + "/../../lib/boucher/env.rb")
       Boucher::env_name.should == "ci"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boucher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4594112676882326117
+      hash: 1891087491595095313
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: