pawnee 0.0.9 → 0.1.0

data/docs/TODO.md

@@ -9,6 +9,7 @@ TODO: Need to make a clear way for pawnee gems (and recipes) to provide actions
 TODO: Run actions in threads (across multiple servers)
 TODO: Test to make sure arguments work directly as well (they probably don't right now)
 TODO: System to check for and register updates/modifications
+TODO: Add apt-get update to package stuff
 
 
 def setup

data/lib/pawnee/pawnee/actions/user.rb

@@ -2,6 +2,19 @@ require 'pawnee/actions/base_model'
 
 module Pawnee
   module Actions
+    # Adds the user (specified by login) to the group
+    def add_user_to_group(login, group)
+      user = self.user(login)
+      user.groups << group
+      user.groups = user.groups.sort.uniq
+      user.save
+    end
+    
+    # Return the user object for the login
+    def user(login)
+      return User.new(self, {:login => login})
+    end
+    
     def create_user(attributes)
       User.new(self, attributes).save
     end
@@ -61,7 +74,7 @@ module Pawnee
         if exit_code == 0
           # The login exists, load in more data
           @gid = exec("id -g #{login}").strip
-          @groups = exec("groups #{login}").gsub(/^[^:]+[:]/, '').strip.split(/ /)
+          @groups = exec("groups #{login}").gsub(/^[^:]+[:]/, '').strip.split(/ /).sort
           self.new_record = false
 
           # Reject any ones we just changed, so its as if we did a find with these

data/lib/pawnee/pawnee/base.rb

@@ -142,18 +142,18 @@ module Pawnee
               # role.
               next unless server.is_a?(String) || server.is_a?(Net::SSH::Connection::Session) || (server['roles'] && server['roles'].include?(self.class.class_role))
 
-              # Set the server for this call
-              self.server = server.is_a?(String) ? server : server['domain']
-
               # Setup the connection to the server
               if server.is_a?(Net::SSH::Connection::Session)
                 self.destination_connection = server
+                self.server = server.host
               elsif server.is_a?(String)
                 # Server name is a string, asume ubuntu
                 self.destination_connection = Net::SSH.start(server, 'ubuntu')
+                self.server = server
               else
                 # Server is a hash
                 self.destination_connection = Net::SSH.start(server['domain'], server['user'] || 'ubuntu')
+                self.server = server['domain']
               end
               
 
@@ -165,7 +165,9 @@ module Pawnee
 
               # Close the connection
               if self.destination_connection
-                self.destination_connection.close
+                # Close the conection only if we created it.  If it was passed in as a connection
+                # then the creator is responsible for closing it
+                self.destination_connection.close unless server.is_a?(Net::SSH::Connection::Session)
                 self.destination_connection = nil
               end
             end

data/lib/pawnee/pawnee/version.rb

@@ -1,3 +1,3 @@
 module Pawnee
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/vagrant/.vagrant

@@ -1 +1 @@
-{"active":{"default":"21e9da4d-756c-4cf9-8cae-caf4f70820f7"}}
+{"active":{"default":"9a7fbb28-386f-478a-b11c-6ce30056d085"}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pawnee
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -307,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1438096213786121322
+      hash: -3847734814061536168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1438096213786121322
+      hash: -3847734814061536168
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22