fabric 0.2.0 → 0.3.0

data/README.rdoc

@@ -64,6 +64,7 @@ This will then execute the map file as pure Ruby, and perform the necessary oper
    # Create a namespace - this will contain all the users defined in the parent,
    # but any users and roles added will only exist within this block
    map.namespace do |cool_website|
+
      # pass multiple IPs to add multiple hosts to this role
      cool_website.role 'memcached', '1.1.1.1', '2.2.2.2'
 
@@ -73,18 +74,22 @@ This will then execute the map file as pure Ruby, and perform the necessary oper
      # Add all our users, including from the parent, to the memcached server:
      grant :all, 'memcached'
 
+     # Timmy isn't allowed onto the syslogging box :(
+     cool_website.role 'syslog', '3.3.3.3'
+     grant "timmy", :all, :except => ["syslog"]
+
    end
  end
 
-== Normal Requirements
+== Testing Requirements
 
-None - this should run straight out of the box.
+You want to get involved? Great! Grab the code and check dependencies with:
 
-== Testing Requirements
+ rake check_dependencies
 
-Bundler (http://github.com/wycats/bundler) is used to manage dependencies, and has cached versions of those gems which are required for execution. For development, it expects those files listed in the Gemfile with :bundle => false to be installed into the version of gems that the gem will run under.
+Previously, bundler (http://github.com/wycats/bundler) was used to package dependencies; unfortunately this doesn't seem to play that nicely with jeweler.
 
-The tests for this gem rely on being able to ssh to a target machine. This can be your development machine, but it's easier if it's a Virtual Machine (try out something from http://virtualbox.org). To run tests, first ensure you have bundled the gems with 'gem bundle', and copy the test.yml.example file to point at a machine which can be safely used to test SSH commands.
+A lot of the tests this gem rely on being able to ssh to a target machine. This can be your development machine, but it's easier if it's a Virtual Machine (try out something from http://virtualbox.org). To run tests, first ensure you have bundled the gems with 'gem bundle', and copy the test.yml.example file to point at a machine which can be safely used to test SSH commands.
 
 Note: add the moment, the tests assume at various points a Linux, rather than an OS X, way of doing things.
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/fab

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
-require File.join(File.dirname(__FILE__), '..', 'vendor','gems','environment')
 require 'fabric'
 
 exit Fabric.run!(ARGV)

data/fabric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fabric}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Phillips"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-01-30}
   s.default_executable = %q{fab}
   s.description = %q{Fabric is a small ruby app to perform tasks on servers via SSH. Built around net/ssh and taking heavy inspiration from Capistrano, it allows you to create policies for server management and perform sysadmin tasks without the need for a process/daemon/dependency or even ruby being installed on the remote server.}
   s.email = %q{sam.phillips@setfiremedia.com}
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
-     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -55,16 +54,7 @@ Gem::Specification.new do |s|
      "tasks/rdoc.rake",
      "tasks/spec.rake",
      "tasks/test.rake",
-     "test.yml.example",
-     "vendor/gems/ruby/1.8/cache/addressable-2.1.1.gem",
-     "vendor/gems/ruby/1.8/cache/columnize-0.3.1.gem",
-     "vendor/gems/ruby/1.8/cache/data_objects-0.10.0.gem",
-     "vendor/gems/ruby/1.8/cache/dm-core-0.10.2.gem",
-     "vendor/gems/ruby/1.8/cache/do_sqlite3-0.10.0.gem",
-     "vendor/gems/ruby/1.8/cache/extlib-0.9.14.gem",
-     "vendor/gems/ruby/1.8/cache/linecache-0.43.gem",
-     "vendor/gems/ruby/1.8/cache/net-ssh-2.0.15.gem",
-     "vendor/gems/ruby/1.8/cache/ruby-debug-base-0.10.3.gem"
+     "test.yml.example"
   ]
   s.homepage = %q{http://github.com/setfire/fabric}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -86,12 +76,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<cucumber>, [">= 0.3.104"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.6.1"])
+      s.add_development_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_development_dependency(%q<database_cleaner>, ["= 0.4.0"])
+      s.add_runtime_dependency(%q<net-ssh>, ["= 2.0.15"])
+      s.add_runtime_dependency(%q<dm-core>, ["= 0.10.2"])
+      s.add_runtime_dependency(%q<data_objects>, ["= 0.10.0"])
+      s.add_runtime_dependency(%q<do_sqlite3>, ["= 0.10.0"])
     else
-      s.add_dependency(%q<cucumber>, [">= 0.3.104"])
+      s.add_dependency(%q<cucumber>, ["= 0.6.1"])
+      s.add_dependency(%q<rspec>, ["= 1.2.9"])
+      s.add_dependency(%q<database_cleaner>, ["= 0.4.0"])
+      s.add_dependency(%q<net-ssh>, ["= 2.0.15"])
+      s.add_dependency(%q<dm-core>, ["= 0.10.2"])
+      s.add_dependency(%q<data_objects>, ["= 0.10.0"])
+      s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
     end
   else
-    s.add_dependency(%q<cucumber>, [">= 0.3.104"])
+    s.add_dependency(%q<cucumber>, ["= 0.6.1"])
+    s.add_dependency(%q<rspec>, ["= 1.2.9"])
+    s.add_dependency(%q<database_cleaner>, ["= 0.4.0"])
+    s.add_dependency(%q<net-ssh>, ["= 2.0.15"])
+    s.add_dependency(%q<dm-core>, ["= 0.10.2"])
+    s.add_dependency(%q<data_objects>, ["= 0.10.0"])
+    s.add_dependency(%q<do_sqlite3>, ["= 0.10.0"])
   end
 end
 

data/features/support/env.rb

@@ -1,6 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 
-require File.join(File.dirname(__FILE__), '..', '..', 'vendor','gems','environment')
-
 require 'fabric'
 require 'fabric-test'

data/lib/fabric/map.rb

@@ -63,9 +63,19 @@ class Map
     end
   end
   
-  def grant(user_opts, role_opts, opts = {})
-    users = load_by_attribute(:users, :name, user_opts)
-    roles = load_by_attribute(:roles, :name, role_opts)
+  # This method has become too long again...
+  def grant(user_names, role_names, role_conditions = {})
+    users = self.users.all
+    roles = self.roles.all
+    
+    users = users.all(:name => user_names) unless user_names == :all
+    roles = roles.all(:name => role_names) unless role_names == :all
+
+    if role_conditions.include?(:except)
+      roles = roles.all(:name.not => role_conditions[:except])
+    end
+    
+    raise DataMapper::ObjectNotFoundError if users.empty? or roles.empty?
     
     roles.each do |role|
       role.users += users
@@ -85,18 +95,4 @@ class Map
       user.keys.create(:public_key => File.read(path))
     end
   end
-
-  def load_association(klass, opts = {})
-    association = self.send(klass.to_sym).all(opts)
-    raise DataMapper::ObjectNotFoundError if association.empty?
-    association
-  end
-  
-  def load_by_attribute(klass, attribute, opts = {})
-    if opts == :all
-      load_association(klass)
-    else
-      load_association(klass, attribute.to_sym => opts)
-    end
-  end
 end

data/spec/classes/map_spec.rb

@@ -170,6 +170,12 @@ describe Map do
           role.users.count.should == 1
         end
       end
+      
+      it "should not add the user to the 'except' list when passed :all" do
+        @map.grant 'test_user', :all, :except => ['test']
+        @map.roles.first(:name => 'test').users.count.should == 0
+        @map.roles.first(:name => 'test again').users.count.should == 1
+      end
     end
     
     it "should raise a Object Not Found if an invalid user identifier is passed" do

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), '..', 'vendor','gems','environment')
-
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'fabric'

data/tasks/jeweler.rake

@@ -7,7 +7,16 @@ begin
     gem.email = "sam.phillips@setfiremedia.com"
     gem.homepage = "http://github.com/setfire/fabric"
     gem.authors = ["Sam Phillips"]
-    gem.add_development_dependency "cucumber", ">= 0.3.104"
+
+    gem.add_development_dependency "cucumber", "0.6.1"
+    gem.add_development_dependency "rspec", "1.2.9"
+    gem.add_development_dependency "database_cleaner", "0.4.0"
+
+    gem.add_dependency 'net-ssh', '2.0.15'
+    gem.add_dependency 'dm-core', '0.10.2'
+    gem.add_dependency 'data_objects', '0.10.0'
+    gem.add_dependency 'do_sqlite3', '0.10.0'
+
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fabric
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Phillips
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +00:00
+date: 2010-01-30 00:00:00 +00:00
 default_executable: fab
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,69 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.104
+        version: 0.6.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.15
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: data_objects
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
     version: 
 description: Fabric is a small ruby app to perform tasks on servers via SSH. Built around net/ssh and taking heavy inspiration from Capistrano, it allows you to create policies for server management and perform sysadmin tasks without the need for a process/daemon/dependency or even ruby being installed on the remote server.
 email: sam.phillips@setfiremedia.com
@@ -34,7 +94,6 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -69,15 +128,6 @@ files:
 - tasks/spec.rake
 - tasks/test.rake
 - test.yml.example
-- vendor/gems/ruby/1.8/cache/addressable-2.1.1.gem
-- vendor/gems/ruby/1.8/cache/columnize-0.3.1.gem
-- vendor/gems/ruby/1.8/cache/data_objects-0.10.0.gem
-- vendor/gems/ruby/1.8/cache/dm-core-0.10.2.gem
-- vendor/gems/ruby/1.8/cache/do_sqlite3-0.10.0.gem
-- vendor/gems/ruby/1.8/cache/extlib-0.9.14.gem
-- vendor/gems/ruby/1.8/cache/linecache-0.43.gem
-- vendor/gems/ruby/1.8/cache/net-ssh-2.0.15.gem
-- vendor/gems/ruby/1.8/cache/ruby-debug-base-0.10.3.gem
 has_rdoc: true
 homepage: http://github.com/setfire/fabric
 licenses: []

data/Gemfile

@@ -1,18 +0,0 @@
-bin_path "vendor/gems/bin"
-
-gem 'net-ssh', '2.0.15'
-gem 'dm-core', '0.10.2'
-gem 'data_objects', '0.10.0'
-gem 'do_sqlite3', '0.10.0'
-
-# Currently forced to bundle this, otherwise internals don't load properly
-# Alternative is to comment out 'disable_system_gems'
-gem 'cucumber', '0.6.1'
-gem 'rspec', '1.2.9'
-
-gem 'jeweler', '1.4.0', :bundle => false
-gem 'database_cleaner', '0.4.0', :bundle => false
-
-gem 'ruby-debug', :bundle => false
-
-# disable_system_gems