boxgrinder-core 0.3.8 → 0.3.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.9
+
+* [BGBUILD-312] Discover which user to switch to after root dependent sections have been executed
+
 v0.3.8
 
 * [BGBUILD-305] Incorrect version information in 0.9.6 schema causing validation errors

data/Manifest

@@ -0,0 +1,44 @@
+CHANGELOG
+LICENSE
+Manifest
+README
+Rakefile
+boxgrinder-core.gemspec
+lib/boxgrinder-core.rb
+lib/boxgrinder-core/appliance-parser.rb
+lib/boxgrinder-core/appliance-validator.rb
+lib/boxgrinder-core/errors.rb
+lib/boxgrinder-core/helpers/appliance-config-helper.rb
+lib/boxgrinder-core/helpers/appliance-definition-helper.rb
+lib/boxgrinder-core/helpers/appliance-transformation-helper.rb
+lib/boxgrinder-core/helpers/exec-helper.rb
+lib/boxgrinder-core/helpers/log-helper.rb
+lib/boxgrinder-core/models/appliance-config.rb
+lib/boxgrinder-core/models/config.rb
+lib/boxgrinder-core/models/task.rb
+lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml
+lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml
+lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml
+rubygem-boxgrinder-core.spec
+spec/appliance-parser-spec.rb
+spec/appliance-validator-spec.rb
+spec/helpers/appliance-config-helper-spec.rb
+spec/helpers/appliance-definition-helper-spec.rb
+spec/helpers/appliance-transformation-helper-spec.rb
+spec/helpers/exec-helper-spec.rb
+spec/helpers/log-helper-spec.rb
+spec/models/appliance-config-spec.rb
+spec/models/config-spec.rb
+spec/rspec/ls/one
+spec/rspec/ls/two
+spec/rspec/src/appliances/0.8.x.appl
+spec/rspec/src/appliances/0.9.x-invalid.appl
+spec/rspec/src/appliances/0.9.x.appl
+spec/rspec/src/appliances/comments.appl
+spec/rspec/src/appliances/ephemeral-repo.appl
+spec/rspec/src/appliances/full.appl
+spec/rspec/src/appliances/invalid-yaml.appl
+spec/rspec/src/appliances/legacy.appl
+spec/rspec/src/appliances/repo.appl
+spec/rspec/src/config/empty
+spec/rspec/src/config/valid

data/boxgrinder-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-09-10}
+  s.date = %q{2011-11-15}
   s.description = %q{Core library for BoxGrinder}
   s.email = %q{info@boxgrinder.org}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/errors.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/appliance-transformation-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml"]

data/lib/boxgrinder-core/models/config.rb

@@ -19,6 +19,7 @@
 require 'rubygems'
 require 'hashery/opencascade'
 require 'yaml'
+require 'etc'
 
 module BoxGrinder
   class Config < OpenCascade
@@ -54,6 +55,8 @@ module BoxGrinder
       merge_with_symbols!(values)
 
       self.backtrace = true if [:debug, :trace].include?(self.log_level)
+
+      populate_user_ids!
     end
 
     def merge_with_symbols!(values)
@@ -73,5 +76,18 @@ module BoxGrinder
         end
       end if second
     end
+
+    def populate_user_ids!
+      self.uid = Process.uid
+      self.gid = Process.gid
+      begin
+        if env = ENV['SUDO_USER'] || ENV['LOGNAME']
+          user = Etc.getpwnam(env)
+          self.uid = user.uid
+          self.gid = user.gid
+        end
+      rescue ArgumentError #No such name, just use initial defaults.
+      end
+    end
   end
-end
+end

data/rubygem-boxgrinder-core.spec

@@ -5,7 +5,7 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.3.8
+Version: 0.3.9
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -76,6 +76,10 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Fri Oct 14 2011 Marc Savy <msavy@redhat.com> - 0.3.9-1
+- Upstream release: 0.3.9
+- [BGBUILD-312] Discover which user to switch to after root dependent sections have been executed
+
 * Wed Sep 7 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.8-1
 - [BGBUILD-305] Incorrect version information in 0.9.6 schema causing validation errors
 

data/spec/models/config-spec.rb

@@ -22,18 +22,25 @@ require 'boxgrinder-core/models/config'
 
 module BoxGrinder
   describe Config do
+
+    def get_config
+      # Some extra challenges due to calls being in initialize
+      Config.any_instance.stub(:populate_user_ids!)
+      config = Config.new
+      config
+    end
+
     it "should not load options from file if it doesn't exist" do
       ENV['BG_CONFIG_FILE'] = ""
 
-      lambda {
-        config = Config.new
+      lambda { get_config
       }.should raise_error(RuntimeError, "You specified empty configuration file path. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
     end
 
     it "should load empty config file" do
       ENV['BG_CONFIG_FILE'] = "#{File.dirname(__FILE__)}/../rspec/src/config/empty"
 
-      config = Config.new
+      config = get_config
       config.force.should == false
       config.log_level.should == :info
     end
@@ -41,7 +48,7 @@ module BoxGrinder
     it "should load config file" do
       ENV['BG_CONFIG_FILE'] = "#{File.dirname(__FILE__)}/../rspec/src/config/valid"
 
-      config = Config.new
+      config = get_config
       config.force.should == true
       config.log_level.should == 'trace'
       config.dir.build.should == 'build'
@@ -50,22 +57,78 @@ module BoxGrinder
 
     it "should raise a file not found error if BG_CONFIG_FILE is set, but the path is invalid" do
       ENV['BG_CONFIG_FILE'] = "leo/tol/stoy"
-      lambda { Config.new }.should raise_error(RuntimeError, "Configuration file 'leo/tol/stoy' couldn't be found. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
+      lambda { get_config }.should raise_error(RuntimeError, "Configuration file 'leo/tol/stoy' couldn't be found. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
     end
 
     it "should raise if the specified config file is whitespace" do
       ENV['BG_CONFIG_FILE'] = "  "
 
       lambda {
-        config = Config.new
+        config = get_config
       }.should raise_error(RuntimeError, "You specified empty configuration file path. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
     end
 
     it "should merge platform" do
       # Make sure we don't have the variable defined anymore
       ENV.delete('BG_CONFIG_FILE')
-      config = Config.new.merge(:platform => :ec2)
+      config = get_config.merge(:platform => :ec2)
       config.platform.should == :ec2
     end
+
+    context ".populate_user_ids!" do
+      before(:each) do
+        # Work-around due to unstubbing not working properly.
+        ['LOGNAME', 'SUDO_USER'].each{|e| ENV.delete(e)}
+        @user = mock('gravy', :uid => 347, :gid => 547)
+        @root = mock('root', :uid => 0, :gid => 0)
+        Etc.stub!(:getpwnam).and_return(@user)
+        @config = Config.new
+      end
+
+
+      it "should discover a user and group when under su" do
+        ENV['LOGNAME'] = 'gravy1'
+        ['SUDO_USER', 'LOGNAME'].each{|v| puts "From config-spec.rb: #{ENV[v]}"}
+
+        Process.should_receive(:uid).and_return(99)
+        Process.should_receive(:gid).and_return(79)
+        Etc.should_receive(:getpwnam).with('gravy1').and_return(@user)
+
+        @config.populate_user_ids!
+        @config.uid.should == 347
+        @config.gid.should == 547
+      end
+
+      it "should discover a user and group when under sudo" do
+        ENV['SUDO_USER'] = 'gravy2'
+        Process.should_receive(:uid).and_return(99)
+        Process.should_receive(:gid).and_return(79)
+        Etc.should_receive(:getpwnam).with('gravy2').and_return(@user)
+
+        @config.populate_user_ids!
+        @config.uid.should == 347
+        @config.gid.should == 547
+      end
+
+      it "should set process uid/gid if variables are not set" do
+        Process.should_receive(:uid).and_return(23)
+        Process.should_receive(:gid).and_return(26)
+
+        @config.populate_user_ids!
+        @config.uid.should == 23
+        @config.gid.should == 26
+      end
+
+      it "should return process uid/gid if user does not exist" do
+        ENV['SUDO_USER'] = 'fakegravy'
+        Process.should_receive(:uid).and_return(23)
+        Process.should_receive(:gid).and_return(26)
+        Etc.should_receive(:getpwnam).with('fakegravy').and_raise(ArgumentError)
+
+        @config.populate_user_ids!
+        @config.uid.should == 23
+        @config.gid.should == 26
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 +02:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency