socialcast 1.2.0 → 1.2.1.RC1

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.3
   - ree
+  - 2.0.0

data/config/ldap.yml

@@ -2,21 +2,21 @@
 # LDAP connections
 connections:
   example_connection_1:
-    username: "cn=Directory Manager"
+    username: "Directory Manager"
     password: "password"
     host: ldap.yourdomain.com
     port: 389
     basedn: "ou=smallpeople,ou=qa,dc=socialcast,dc=com"
     filter: "(mail=*)"
   example_connection_2:
-    username: "cn=Directory Manager"
+    username: "Directory Manager"
     password: "password"
     host: ldap.yourdomain.com
     port: 389
     basedn: "ou=tinypeople,ou=qa,dc=yourdomain,dc=com"
     filter: "(mail=*)"
   example_encrypted_connection:
-    username: "cn=Directory Manager"
+    username: "Directory Manager"
     password: "password"
     host: ldap.yourdomain.com
     port: 389
@@ -59,13 +59,14 @@ permission_mappings:
   # configure LDAP field for group memberships (ex: memberof, isMemberOf, etc)
   attribute_name: memberof
   account_types:
-    external: "cn=External,dc=example,dc=com"
+    external: "CN=External,OU=Groups,DC=example,DC=com"
   roles:
-    tenant_admin: "cn=Admins,dc=example,dc=com"
-    sbi_admin: "cn=Admins,dc=example,dc=com"
-    reach_admin: "cn=Admins,dc=example,dc=com"
-    town_hall_admin: "cn=Admins,dc=example,dc=com"
+    tenant_admin: "CN=Admins,OU=Groups,DC=example,DC=com"
+    sbi_admin: "CN=Admins,OU=Groups,DC=example,DC=com"
+    reach_admin: "CN=Admins,OU=Groups,DC=example,DC=com"
+    town_hall_admin: "CN=Admins,OU=Groups,DC=example,DC=com"
 
+  # Role search definitions need to be EXACT matches to the output from your LDAP server.
 
 # general script options
 options:

data/lib/socialcast/cli.rb

@@ -43,16 +43,16 @@ module Socialcast
     method_option :proxy, :type => :string, :desc => 'HTTP proxy options for connecting to Socialcast server'
     def authenticate
       user = options[:user] || ask('Socialcast username: ')
-      password = options[:password] || HighLine.new.ask("Socialcast password: ") { |q| q.echo = false }
+      password = options[:password] || HighLine.new.ask("Socialcast password: ") { |q| q.echo = false }.to_s
       domain = options[:domain]
 
-      url = ['https://', domain, '/api/authentication.json'].join
+      url = ['https://', domain, '/api/authentication'].join
       say "Authenticating #{user} to #{url}"
       params = {:email => user, :password => password }
       RestClient.log = Logger.new(STDOUT) if options[:trace]
       RestClient.proxy = options[:proxy] if options[:proxy]
       resource = RestClient::Resource.new url
-      response = resource.post params
+      response = resource.post params, :accept => :json
       say "API response: #{response.body.to_s}" if options[:trace]
       communities = JSON.parse(response.body.to_s)['communities']
       domain = communities.detect {|c| c['domain'] == domain} ? domain : communities.first['domain']
@@ -73,8 +73,8 @@ module Socialcast
       options[:attachments].each do |path|
         Dir[File.expand_path(path)].each do |attachment|
           say "Uploading attachment #{attachment}..."
-          uploader = Socialcast.resource_for_path '/api/attachments.json', {}, options[:trace]
-          uploader.post :attachment => File.new(attachment) do |response, request, result|
+          uploader = Socialcast.resource_for_path '/api/attachments', {}, options[:trace]
+          uploader.post({:attachment => File.new(attachment)}, {:accept => :json}) do |response, request, result|
             if response.code == 201
               attachment_ids << JSON.parse(response.body)['attachment']['id']
             else
@@ -186,11 +186,15 @@ module Socialcast
       else
         say "Uploading dataset to Socialcast..."
         resource = Socialcast.resource_for_path '/api/users/provision', http_config
-        File.open(output_file, 'r') do |file|
-          request_params = {:file => file}
-          request_params[:skip_emails] = 'true' if (config['options']["skip_emails"] || options[:skip_emails])
-          request_params[:test] = 'true' if (config['options']["test"] || options[:test])
-          resource.post request_params
+        begin
+          File.open(output_file, 'r') do |file|
+            request_params = {:file => file}
+            request_params[:skip_emails] = 'true' if (config['options']["skip_emails"] || options[:skip_emails])
+            request_params[:test] = 'true' if (config['options']["test"] || options[:test])
+            resource.post request_params, :accept => :json
+          end
+        rescue RestClient::Unauthorized => e
+          Kernel.abort "Authenticated user either does not have administration privileges or the community is not configured to allow provisioning. Please contact Socialcast support to if you need help." if e.http_code == 401
         end
         say "Finished"
       end
@@ -217,11 +221,11 @@ module Socialcast
       end
       def current_socialcast_users(http_config)
         current_socialcast_list = Set.new
-        request_params = {:per_page => 500, :format => 'json'}
+        request_params = {:per_page => 500}
         request_params[:page] = 1
         resource = create_socialcast_user_index_request(http_config, request_params)
         while true
-          response = resource.get
+          response = resource.get :accept => :json
           result = JSON.parse(response)
           users = result["users"]
           break if users.blank?
@@ -234,7 +238,7 @@ module Socialcast
         current_socialcast_list
       end
       def create_socialcast_user_index_request(http_config, request_params)
-        path_template = "/api/users.json?format=%{format}&per_page=%{per_page}&page=%{page}"
+        path_template = "/api/users?per_page=%{per_page}&page=%{page}"
         Socialcast.resource_for_path((path_template % request_params), http_config)
       end
     end

data/lib/socialcast/message.rb

@@ -2,6 +2,8 @@ require 'active_resource'
 
 module Socialcast
   class Message < ActiveResource::Base
+    headers['Accept'] = 'application/json'
+
     def self.configure_from_credentials
       Socialcast::Message.site = ['https://', Socialcast.credentials[:domain], '/api'].join
       Socialcast::Message.proxy = Socialcast.credentials[:proxy] if Socialcast.credentials[:proxy]

data/lib/socialcast/version.rb

@@ -1,3 +1,3 @@
 module Socialcast
-  VERSION = "1.2.0"
+  VERSION = "1.2.1.RC1"
 end

data/lib/socialcast.rb

@@ -26,12 +26,15 @@ module Socialcast
     def basic_auth_options
       {:user => credentials[:user], :password => credentials[:password]}
     end
+    def default_options
+      basic_auth_options
+    end
     # configure restclient for api call
     def resource_for_path(path, options = {}, debug = true)
       RestClient.log = Logger.new(STDOUT) if debug
       RestClient.proxy = credentials[:proxy] if credentials[:proxy]
       url = ['https://', credentials[:domain], path].join
-      RestClient::Resource.new url, options.merge(basic_auth_options)
+      RestClient::Resource.new url, options.merge(default_options)
     end
   end
 end

data/spec/cli_spec.rb

@@ -9,6 +9,7 @@ describe Socialcast::CLI do
         stub_request(:post, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/messages.json").
                  with(:body => /message\_type\"\:null/).
                  with(:body => /testing/).
+                 with(:headers => {'Accept' => 'application/json'}).
                  to_return(:status => 200, :body => "", :headers => {})
 
         Socialcast::CLI.start ['share', 'testing']
@@ -24,6 +25,7 @@ describe Socialcast::CLI do
         stub_request(:post, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/messages.json").
                  with(:body => /message\_type\"\:review\_request/).
                  with(:body => /please\sreview/).
+                 with(:headers => {'Accept' => 'application/json'}).
                  to_return(:status => 200, :body => "", :headers => {})
 
         Socialcast::CLI.start ['share', 'please review', '--message_type=review_request']
@@ -37,6 +39,7 @@ describe Socialcast::CLI do
         Socialcast.stub(:credentials).and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
         stub_request(:post, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/messages.json").
                  with(:body => /group\_id\"\:123/).
+                 with(:headers => {'Accept' => 'application/json'}).
                  to_return(:status => 200, :body => "", :headers => {})
 
         Socialcast::CLI.start ['share', 'hi', '--group_id=123']
@@ -51,6 +54,7 @@ describe Socialcast::CLI do
         stub_request(:post, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/messages.json").
                  with(:body => /message\_type\"\:null/).
                  with(:body => /testing/).
+                 with(:headers => {'Accept' => 'application/json'}).
                  to_return(:status => 200, :body => "", :headers => {})
 
         Socialcast::CLI.start ['share', 'testing']
@@ -105,6 +109,26 @@ describe Socialcast::CLI do
       end
       it 'does post to Socialcast and does not call Kernel.abort' do end # see expectations
     end
+    context 'with socialcast returning 401' do
+      before do
+        Net::LDAP.any_instance.stub(:search).and_return(nil)
+
+        @result = ''
+        Zlib::GzipWriter.stub(:open).and_yield(@result)
+        Socialcast.stub(:credentials).and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
+        Socialcast::CLI.any_instance.should_receive(:load_configuration).with('/my/path/to/ldap.yml').and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_without_permission_mappings.yml')))
+        File.should_receive(:exists?).with('/my/path/to/ldap.yml').and_return(true)
+
+        File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
+        rest_client_resource = double(:rest_client_resource)
+        rest_client_resource.stub(:post).and_raise(RestClient::Unauthorized.new(mock('Unauthorized HTTP Response', :code => '401')))
+        Socialcast.stub(:resource_for_path).and_return(rest_client_resource)
+        Kernel.should_receive(:abort).with("Authenticated user either does not have administration privileges or the community is not configured to allow provisioning. Please contact Socialcast support to if you need help.").once
+
+        Socialcast::CLI.start ['provision', '-c', '/my/path/to/ldap.yml', '-f']
+      end
+      it "raises Kernel abort" do end # see expectations
+    end
     context 'with absolute path to ldap.yml file' do
       before do
         @entry = Net::LDAP::Entry.new("dc=example,dc=com")

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1.RC1
+  prerelease: 6
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2159242780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159242780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2159241780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2159241780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2159241300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2159241300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2159240840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2159240840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap
-  requirement: &2159240200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2159240200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2159239520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2159239520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.11
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159238860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *2159238860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2159238400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,18 +134,28 @@ dependencies:
         version: 1.7.7
   type: :development
   prerelease: false
-  version_requirements: *2159238400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159237940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2159237940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: publish messages to your stream from a command line interface
 email:
 - ryan@socialcast.com
@@ -162,15 +207,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -357253051264046673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: socialcast
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: command line interface to socialcast api