socialcast 1.0.0.beta3 → 1.0.0.beta4

data/config/ldap.yml

@@ -1,5 +1,5 @@
 --- 
-# LDAP connection information
+# LDAP connections
 connections:
   example_connection_1:
     username: "cn=Directory Manager"
@@ -24,21 +24,30 @@ connections:
     filter: "(mail=*)"
     encryption: simple_tls
 
+
 # LDAP attribute mappings
 mappings: 
   first_name: givenName
   last_name: sn
   email: mail
-  #only use employee_number if the email is unknown
-  #employee_number: emp_id
-  #only use unique_identifier if you do not wish to use email as the main user identification method
-  #unique_identifier: samaccountname
+  # only use employee_number if the email is unknown
+  # employee_number: emp_id
+  # only use unique_identifier if you do not wish to use email as the main user identification method
+  # unique_identifier: samaccountname
+
+
+# general script options
+options:
+  # cleanup the extracted ldap data file after run is complete
+  delete_users_file: false
+  # skip sending emails to newly activated users
+  skip_emails: true
+  # do not actually provision accounts
+  # useful during testing
+  test: true
 
-delete_users_file: false
-# test being true implies that you wish to skip_emails
-test: true
-skip_emails: true
 
-# (optional) http_proxy setting
-# only needed if the script must connect to Socialcast through a proxy
-# http_proxy: "http://username:password@proxy.company.com:3128"
+# http options for connecting to Socialcast servers
+http:
+  # optional setting if script must connect to Socialcast server through a proxy
+  # proxy: "http://username:password@proxy.company.com:3128"

data/lib/socialcast/cli.rb

@@ -68,10 +68,12 @@ module Socialcast
     end
 
     desc 'provision', 'provision users from ldap compatible user repository'
-    method_option :setup, :default => false
     method_option :config, :default => 'ldap.yml', :aliases => '-c'
     method_option :output, :default => 'users.xml.gz', :aliases => '-o'
-    method_option :delete_users_file, :default => true
+    method_option :setup, :type => :boolean
+    method_option :delete_users_file, :type => :boolean
+    method_option :test, :type => :boolean
+    method_option :skip_emails, :type => :boolean
     def provision
       config_file = File.join Dir.pwd, options[:config]
 
@@ -141,18 +143,19 @@ module Socialcast
       say "Finished Scanning" 
       say "Sending to Socialcast" 
 
+      http_config = config.fetch('http', {})
       RestClient.log = Logger.new(STDOUT)
-      RestClient.proxy = config["http_proxy"] if config["http_proxy"]
+      RestClient.proxy = http_config['proxy'] if http_config['proxy']
       url = ['https://', credentials[:domain], '/api/users/provision'].join
       private_resource = RestClient::Resource.new url, :user => credentials[:username], :password => credentials[:password], :timeout => 660
       File.open(output_file, 'r') do |file|
         request_params = {:file => file}
-        request_params[:skip_emails] = "true" if config["skip_emails"]
-        request_params[:test] = "true" if config["test"]
+        request_params[:skip_emails] = 'true' if (config['options']["skip_emails"] || options[:skip_emails])
+        request_params[:test] = 'true' if (config['options']["test"] || options[:test])
         private_resource.post request_params
       end
 
-      File.delete(output_file) if options[:delete_users_file]
+      File.delete(output_file) if (config['options']['delete_users_file'] || options[:delete_users_file])
 
       say "Finished"
     end

data/lib/socialcast/version.rb

@@ -1,3 +1,3 @@
 module Socialcast
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast
 version: !ruby/object:Gem::Version 
-  hash: 62196357
+  hash: 62196363
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 3
-  version: 1.0.0.beta3
+  - 4
+  version: 1.0.0.beta4
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-07-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda