sudo 0.1.0 → 0.1.1

data/MANIFEST

@@ -1,6 +1,8 @@
 examples/block.rb
 examples/dsl.rb
 examples/new.rb
+examples/writable_root.rb
+examples/lib/writable_root.rb
 libexec/server.rb
 lib/sudo/constants.rb
 lib/sudo/dsl.rb

data/README.rdoc

@@ -44,9 +44,8 @@ Use it!
   sudo[MyClass].my_class_method
 
 
-When you've done, {stop!}[link:Sudo/Wrapper.html#method-i-stop!] it. 
-Otherwise, that will be done (only) when the +sudo+ object gets 
-garbage-collected.
+When you've done, +stop!+ it. Otherwise, that will be done (only) when 
+the +sudo+ object gets garbage-collected.
 
   sudo.stop!
 
@@ -77,22 +76,28 @@ Access control is entirely delegated to +sudo+.
 +sudo+ has a +-A+ option to accept password via an external program
 (maybe graphical): support this feature.
 
-== THANKS
+== CREDITS 
 
-Thanks to Tony Arcieri and Brian Candler for suggestions on 
-ruby-talk[http://www.ruby-forum.com/topic/262655].
-
-== AUTHOR
+=== AUTHOR
 
 {Guido De Rosa}[http://github.com/gderosa/].
 
-Sponsored by {VEMAR s.a.s.}[http://www.vemarsas.it/] 
+Sponsored by {VEMAR s.a.s.}[http://www.vemarsas.it/]
+
+=== CONTRIBUTORS
+
+{Robert M. Koch}[http://github.com/threadmetal/].
+
+=== THANKS
+
+Thanks to Tony Arcieri and Brian Candler for suggestions on 
+ruby-talk[http://www.ruby-forum.com/topic/262655].
 
-== LICENSE:
+=== COPYRIGHT
 
 (The MIT License)
 
-Copyright (c) 2010 Guido De Rosa
+Copyright (c) 2010, 2011, 2012, 2013 Guido De Rosa
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -112,8 +117,3 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
-

data/examples/lib/writable_root.rb

@@ -0,0 +1,7 @@
+class WritableRoot
+  def check
+    puts "As uid = #{Process.uid}, writable root = #{File.writable? '/'} (object_id=#{object_id})"
+  end
+end
+
+

data/examples/writable_root.rb

@@ -0,0 +1,52 @@
+require 'sudo'
+
+
+t0 = Time.now 
+su = Sudo::Wrapper.new.start!
+t1 =  Time.now
+
+writable_root                 = su[File].writable? '/'
+t2 = Time.now
+writable_root_by_normal_user  = File.writable? '/'
+
+puts
+puts "writable_root                                 = #{writable_root}"
+puts "writable_root_by_normal_user                  = #{writable_root_by_normal_user}"
+puts "Starting Sudo::Wrapper object took              #{t1-t0} seconds"
+puts "Using it, as in  su[File].writable? '/', took   #{t2-t1} seconds"
+
+puts
+puts "Now trying on an instance of WritableRoot custom class:"
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
+require 'writable_root'
+
+wr1 = WritableRoot.new
+wr2 = WritableRoot.new
+
+wr1.check
+su[wr2].check
+
+puts
+puts "Hit ENTER to stop the Sudo::Wrapper object"
+puts "(in the meantime, you can look at the ruby sudo-ed process with ps)" 
+gets
+
+# Optional (it will be stopped automatically as soon as 'su' object gets out of scope).
+su.stop!
+
+puts "Now trying with a block (Sudo::Wrapper.run):"
+writable_root = Sudo::Wrapper.run do |sudo| 
+  print "As uid=#{ sudo[Process].uid  }, "
+  sudo[File].writable? '/'
+end
+puts "writable_root = #{writable_root.inspect}"
+
+
+
+
+
+
+
+
+

data/lib/sudo/constants.rb

@@ -1,9 +1,10 @@
 module Sudo
 
-  VERSION       = '0.1.0'
+  VERSION       = '0.1.1'
   ROOTDIR       = File.expand_path File.join File.dirname(__FILE__), '../..'
   LIBDIR        = File.join ROOTDIR, 'lib'
   SERVER_SCRIPT = File.join ROOTDIR, 'libexec/server.rb'
+  SUDO_CMD = ENV['rvm_path'] ? 'rvmsudo' : 'sudo'
 
   class RuntimeError  < RuntimeError; end
 

data/lib/sudo/wrapper.rb

@@ -5,12 +5,6 @@ require 'sudo/constants'
 require 'sudo/system'
 require 'sudo/proxy'
 
-begin
-  DRb.current_server
-rescue DRb::DRbServerNotFound
-  DRb.start_service
-end
-
 module Sudo
   class Wrapper
 
@@ -27,21 +21,15 @@ module Sudo
     class << self
 
       # Yields a new running Sudo::Wrapper, and do all the necessary
-      # cleanup when the block exits. 
+      # cleanup when the block exits.
       #
-      # ruby_opts:: is passed to Sudo::Wrapper::new .      
-      def run(ruby_opts) # :yields: sudo
+      # ruby_opts:: is passed to Sudo::Wrapper::new .
+      def run(ruby_opts = '') # :yields: sudo
         sudo = new(ruby_opts).start!
-        yield sudo
+        retval = yield sudo
         sudo.stop!
-      end 
-
-      # currently unused
-      #def load_features
-      #  ObjectSpace.each_object(self).each{|x| x.load_features} 
-      #end
-
-      protected
+        retval
+      end
 
       # Do the actual resources clean-up.
       #
@@ -56,10 +44,10 @@ module Sudo
 
     # +ruby_opts+ are the command line options to the sudo ruby interpreter;
     # usually you don't need to specify stuff like "-rmygem/mylib", libraries
-    # will be sorta "inherited". 
-    def initialize(ruby_opts='') 
+    # will be sorta "inherited".
+    def initialize(ruby_opts='')
       @proxy            = nil
-      @socket           = "/tmp/rubysu-#{Process.pid}-#{object_id}" 
+      @socket           = "/tmp/rubysu-#{Process.pid}-#{object_id}"
       @sudo_pid         = nil
       @ruby_opts        = ruby_opts
       @loaded_features  = []
@@ -67,14 +55,14 @@ module Sudo
     end
 
     def server_uri; "drbunix:#{@socket}"; end
-    
+
     # Start the sudo-ed Ruby process.
-    def start! 
+    def start!
       Sudo::System.check
-      
-      @sudo_pid = spawn( 
-"sudo ruby -I#{LIBDIR} #{@ruby_opts} #{SERVER_SCRIPT} #{@socket} #{Process.uid}"
-      ) 
+
+      @sudo_pid = spawn(
+"#{SUDO_CMD} ruby -I#{LIBDIR} #{@ruby_opts} #{SERVER_SCRIPT} #{@socket} #{Process.uid}"
+      )
       Process.detach(@sudo_pid) if @sudo_pid # avoid zombies
       ObjectSpace.define_finalizer self, Finalizer.new(
           :pid => @sudo_pid, :socket => @socket
@@ -83,23 +71,16 @@ module Sudo
       if wait_for(:timeout => 1){File.exists? @socket}
         @proxy = DRbObject.new_with_uri(server_uri)
       else
-        raise RuntimeError, "Couldn't create DRb socket #{@socket}"  
+        raise RuntimeError, "Couldn't create DRb socket #{@socket}"
       end
 
       #set_load_path # apparently, we don't need this
-      
+
       load_features
 
       self
     end
 
-    # apparently, we don't need this
-    #def set_load_path
-    #  ($LOAD_PATH - @load_path).reverse.each do |dir|
-    #    @proxy.proxy Kernel, :eval, "$LOAD_PATH.unshift #{dir}"
-    #  end
-    #end 
-
     # Load needed libraries in the DRb server. Usually you don't need
     # to call this directly.
     def load_features
@@ -128,7 +109,7 @@ module Sudo
       self.class.cleanup!(:pid => @sudo_pid, :socket => @socket)
       @proxy = nil
     end
- 
+
     # Gives a copy of +object+ with root privileges.
     def [](object)
       if running?
@@ -154,4 +135,3 @@ module Sudo
 
   end
 end
-

metadata

@@ -1,39 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sudo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guido De Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-25 00:00:00 +02:00
-default_executable: 
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Give Ruby objects superuser privileges.
+
 
-description: |
-  Give Ruby objects superuser privileges.
-  
   Based on dRuby and sudo (the Unix program).
 
+'
 email: guido.derosa@vemarsas.it
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - examples/block.rb
 - examples/dsl.rb
 - examples/new.rb
+- examples/writable_root.rb
+- examples/lib/writable_root.rb
 - libexec/server.rb
 - lib/sudo/constants.rb
 - lib/sudo/dsl.rb
@@ -46,39 +40,31 @@ files:
 - lib/sudo/wrapper.rb
 - MANIFEST
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/gderosa/rubysu
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Give Ruby objects superuser privileges
 test_files: []
-