socialcast 1.3.16 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa30064bc024f7760f5eeb31cf6cd716e205ec19
-  data.tar.gz: a3fac062e94471e4451e9cd2d031d888af401480
+  metadata.gz: 0dbbca03d19c73c3c76248ca1157e7f6d47d7354
+  data.tar.gz: 5fd8567b4330e9d8a9afe217f1465a20cd31a7c9
 SHA512:
-  metadata.gz: 9584c35c3a66db2aaf5306dbea3644a934cf86dfa024c2cd581152c962f91377c782f7c513f972b55e721e585f66e36fd3dc975f6d59fb3a79f2e084b0552780
-  data.tar.gz: ce57f494ad75c3ddbfd490c7200ba9537ad056153c5133631b9c4affb5e03429c5fcafa5bb6f16aab626df752ff346578d52e67f6bf54a1c881040a5fef96203
+  metadata.gz: 0020b41df43901a27516b982bc6ef70b11c5c8c085cc63b4e296b022aa5fa70bf4df3ca7e4d9c03917e53f241e2cc81cbbd3e4c36cae42e70834e2dfe2d5547d
+  data.tar.gz: c84885daf855d714b402be2c7100dd69c73169789fd8cb8f06ab0d135092c359f49640db07f8fcd77daa338828628c17640ede31a30cf4da79a365ebfba2878b

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.2

data/.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.6
+  - 2.2.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011 Socialcast, Inc
+Copyright (c) 2011 - 2015 VMware, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -56,5 +56,5 @@ See [CONTRIBUTORS.txt](https://github.com/socialcast/socialcast-command-line/blo
 
 ## Copyright
 
-Copyright (c) 2011 - 2014 Socialcast Inc.
+Copyright (c) 2011 - 2015 VMware Inc.
 See [LICENSE.txt](https://github.com/socialcast/socialcast-command-line/blob/master/LICENSE.txt) for details.

data/config/ldap.yml

@@ -89,3 +89,6 @@ options:
 # http options for connecting to Socialcast servers
 http:
   timeout: 660
+  # Skip validation of the SSL certificate on the socialcast server. Default=false
+  # WARNING: enabling this could allow an unauthorized party to view your data
+  # skip_ssl_validation: false

data/lib/socialcast/command_line/provision_user.rb

@@ -2,6 +2,7 @@ require 'zlib'
 require 'builder'
 require 'set'
 require 'fileutils'
+require 'active_support/core_ext/string/strip'
 
 module Socialcast
   module CommandLine
@@ -55,13 +56,32 @@ module Socialcast
               request_params[:add_only] = 'true' if (@ldap_config.fetch('options', {})['add_only'] || @options[:add_only])
               resource.post request_params, :accept => :json
             end
-          rescue RestClient::Unauthorized => e
-            raise ProvisionError.new "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
+          rescue RestClient::Unauthorized, RestClient::Forbidden => e
+            raise ProvisionError.new provision_error_message(e)
           end
           log "Finished"
         end
         File.delete(output_file) if (@ldap_config.fetch('options', {})['delete_users_file'] || @options[:delete_users_file])
       end
+
+      private
+
+      def provision_error_message(error)
+        case error
+        when RestClient::Unauthorized
+          <<-EOS.strip_heredoc
+            Received an "Unauthorized" error from the Socialcast server. Please check the following:
+            * Community has basic authentication enabled
+            * User has administration privileges
+            * User or External System is active
+            * Credentials and community domain are correct in #{Socialcast::CommandLine.credentials_file}
+          EOS
+        when RestClient::Forbidden
+          <<-EOS.strip_heredoc
+            Received a "Forbidden" error from the Socialcast server. Please check that your community has directory integration enabled.
+          EOS
+        end
+      end
     end
   end
 end

data/lib/socialcast/command_line/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module CommandLine
-    VERSION = "1.3.16"
+    VERSION = "1.3.17"
   end
 end

data/lib/socialcast.rb

@@ -40,8 +40,11 @@ module Socialcast
     def self.resource_for_path(path, options = {}, debug = true)
       RestClient.log = Logger.new(STDOUT) if debug
       RestClient.proxy = credentials[:proxy] if credentials[:proxy]
+
+      rest_client_options = options.merge(authentication(options))
+      rest_client_options[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE if rest_client_options.delete('skip_ssl_validation')
       url = ['https://', credentials[:domain], path].join
-      RestClient::Resource.new url, options.merge(authentication(options))
+      RestClient::Resource.new url, rest_client_options
     end
 
     def self.authentication(options)

data/socialcast.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'socialcast-net-ldap', '~> 0.1', '>= 0.1.6'
   s.add_runtime_dependency 'activeresource', '~> 4.0'
   s.add_runtime_dependency 'activesupport', '~> 4.0'
-  s.add_development_dependency "rspec", '~> 2.11'
-  s.add_development_dependency "webmock", '~> 1.7', '>= 1.7.7'
+  s.add_development_dependency 'rspec', '~> 3.3'
+  s.add_development_dependency 'webmock', '~> 1.7', '>= 1.7.7'
   s.add_development_dependency 'rake', '0.9.2.2'
   s.add_development_dependency 'pry', '~> 0.9'
 

data/spec/socialcast/command_line/authenticate_spec.rb

@@ -7,9 +7,9 @@ describe Socialcast::CommandLine::Authenticate do
 
   describe '#request' do
     before do
-      RestClient::Resource.should_receive(:new).with(url, {}).and_call_original
-      RestClient::Resource.any_instance.should_receive(:post).with(subject.params, :accept => :json)
-      authenticate.should_receive(:set_default_credentials).and_return(true)
+      expect(RestClient::Resource).to receive(:new).with(url, {}).and_call_original
+      expect_any_instance_of(RestClient::Resource).to receive(:post).with(subject.params, :accept => :json)
+      expect(authenticate).to receive(:set_default_credentials).and_return(true)
       authenticate.request
     end
     context 'for a regular user' do
@@ -39,13 +39,13 @@ describe Socialcast::CommandLine::Authenticate do
       let(:stubbed_config_dir) { File.join(File.dirname(__FILE__), '..', '..', 'fixtures') }
       let(:current_user_stub) { { :user => { :id => 123 } } }
       let(:current_user_error) { { :error => "Failed to authenticate due to password" } }
-      before { Socialcast::CommandLine.stub(:config_dir).and_return(stubbed_config_dir) }
+      before { allow(Socialcast::CommandLine).to receive(:config_dir).and_return(stubbed_config_dir) }
       context 'as a successfull authenticated user' do
         before do
           stub_request(:get, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/userinfo.json").
             to_return(:status => 200, :body => current_user_stub.to_json)
         end
-        it { current_user['id'].should == 123 }
+        it { expect(current_user['id']).to eq(123) }
       end
       context 'when you not authenticated properly' do
         before do