socialcast 1.3.5 → 1.3.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWI2YTIwMmZjZjVmOGY1YTQ0ZTMzMzBiOWExY2E3NGRhMzg4Y2Y1NA==
-  data.tar.gz: !binary |-
-    NjU1MmUyYjE3ZWI1NmE2NjhiZjFiMWI3ZTFlYTU2ODNkMGM4YmI2ZA==
+SHA1:
+  metadata.gz: 059c8d71c405b6bd225ddf6bcadd22c55448c244
+  data.tar.gz: 73dc16b3f63221865f07dd46c74f992d0f8ae96a
 SHA512:
-  metadata.gz: !binary |-
-    NDhmMTEyM2VkYTFhOTQxM2JkMmIwM2M0N2Q3YWUxNzJjNjBlMWJkMGYzNGY3
-    NThmYTA2ZjViY2M4MDY5ZDQ3Y2QyOTI3NmY1ZTRjNjNiYzMxYjk1ODUzYmI2
-    MmIwMzg0NzRkNWJmMDMzYTk4ZTk1NjE0YWRjMjJjZDA1MmEzYzM=
-  data.tar.gz: !binary |-
-    YTkwYTYwZjA3NzU4ZWI2YTRjM2MxZmJmOWNjODhjYTY3MjY3YjBkYzc2NjQw
-    ZGZjZGMzMTBhOWRmNDI4Nzg2NTkwZjE3YWNiZGFiOWEzMzk4NmQ5NzQzYmEx
-    ZTJjODk3MGQyY2Y3YWFkMWY2ZmIwOWViMmYyZmQ1NDE3MTg4NjE=
+  metadata.gz: 49c4a5675ab1f9832d56aa7ee23678977424020cd002573c72183f1842f6a72adb23ffb1a18464720abcdaf42da17ea5594545866f59174cf86c4746332c1cff
+  data.tar.gz: 9ca90bb330803ed0dae3fe8ae78b86fccdb1c86c934ed43bf3497c41e455ba494f740abecba293132496149ad6d4eaf292b9d90586239cb7909d90769919b635

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p125@socialcast-command-line --create
+rvm use ruby-2.1.1@socialcast-command-line --create

data/lib/socialcast/command_line/cli.rb

@@ -104,7 +104,6 @@ module Socialcast
       method_option :test, :type => :boolean, :desc => 'Do not persist changes'
       method_option :skip_emails, :type => :boolean, :desc => 'Do not send signup emails to users'
       method_option :force, :type => :boolean, :aliases => '-f', :default => false, :desc => 'Proceed with provisioning even if no users are found, which would deactivate all users in the community'
-      method_option :sanity_check, :type => :boolean, :default => false, :desc => 'Double check that users marked for termination really no longer exist'
       method_option :plugins, :type => :array, :desc => "Pass in an array of plugins. Can be either the gem require or the absolute path to a ruby file"
       def provision
         config = ldap_config options

data/lib/socialcast/command_line/ldap_connector.rb

@@ -50,33 +50,6 @@ module Socialcast
         nil
       end
 
-      def ldap_search_attributes
-        membership_attribute = permission_mappings.fetch 'attribute_name', 'memberof'
-        attributes = attribute_mappings.values.map do |mapping_value|
-          value = begin
-            mapping_value.camelize.constantize
-          rescue NameError
-            mapping_value
-          end
-
-          case value
-          when Hash
-            dup_mapping_value = value.dup
-            dup_mapping_value.delete("value")
-            dup_mapping_value.values
-          when String
-            value
-          when Class, Module
-            if value.respond_to?(:attributes)
-              value.attributes
-            else
-              mapping_value
-            end
-          end
-        end.flatten
-        attributes << membership_attribute
-      end
-
       def attribute_mappings
         @attribute_mappings ||= connection_config['mappings']
         @attribute_mappings ||= @config.fetch 'mappings', {}
@@ -107,11 +80,39 @@ module Socialcast
         end
       end
 
+      private
+
       def connection_config
         @config["connections"][connection_name]
       end
 
-      private
+      def ldap_search_attributes
+        membership_attribute = permission_mappings.fetch 'attribute_name', 'memberof'
+        attributes = attribute_mappings.values.map do |mapping_value|
+          value = begin
+            mapping_value.camelize.constantize
+          rescue NameError
+            mapping_value
+          end
+
+          case value
+          when Hash
+            dup_mapping_value = value.dup
+            dup_mapping_value.delete("value")
+            dup_mapping_value.values
+          when String
+            value
+          when Class, Module
+            if value.respond_to?(:attributes)
+              value.attributes
+            else
+              mapping_value
+            end
+          end
+        end.flatten
+        attributes << membership_attribute
+      end
+
 
       def ldap
         @ldap ||= Net::LDAP.new(:host => connection_config["host"], :port => connection_config["port"], :base => connection_config["basedn"]).tap do |ldap_instance|

data/lib/socialcast/command_line/provision.rb

@@ -52,24 +52,6 @@ module Socialcast
           end # export
         end # gzip
 
-        if @options[:sanity_check]
-          puts "Sanity checking users currently marked as needing to be terminated"
-          each_ldap_connector do |connector|
-            attr_mappings = connector.attribute_mappings
-            (current_socialcast_users(http_config) - user_whitelist).each do |user_identifiers|
-              combined_filters = []
-              ['email', 'unique_identifier', 'employee_number'].each_with_index do |identifier, index|
-                combined_filters << ((attr_mappings[identifier].blank? || user_identifiers[index].nil?) ? nil : Net::LDAP::Filter.eq(attr_mappings[identifier], user_identifiers[index]))
-              end
-              combined_filters.compact!
-              filter = ((combined_filters.size > 1) ? '(|%s)' : '%s') % combined_filters.join(' ')
-              filter = Net::LDAP::Filter.construct(filter) & Net::LDAP::Filter.construct(connector.connection_config["filter"])
-              ldap_result = connector.ldap.search(:return_result => true, :base => connector.connection_config["basedn"], :filter => filter, :attributes => connector.ldap_search_attributes)
-              raise ProvisionError.new "Found user marked for termination that should not be terminated: #{user_identifiers}" unless ldap_result.blank?
-            end
-          end
-        end
-
         if user_whitelist.empty? && !@options[:force]
           raise ProvisionError.new "Skipping upload to Socialcast since no users were found"
         else
@@ -177,30 +159,6 @@ module Socialcast
         end
         puts "Finished scanning #{count} users"
       end
-
-      def current_socialcast_users(http_config)
-        current_socialcast_list = Set.new
-        request_params = {:per_page => 500}
-        request_params[:page] = 1
-        resource = create_socialcast_user_index_request(http_config, request_params)
-        loop do
-          response = resource.get :accept => :json
-          result = JSON.parse(response)
-          users = result["users"]
-          break if users.blank?
-          request_params[:page] += 1
-          resource = create_socialcast_user_index_request(http_config, request_params)
-          users.each do |user|
-            current_socialcast_list << [user['contact_info']['email'], user['company_login'], user['employee_number']]
-          end
-        end
-        current_socialcast_list
-      end
-
-      def create_socialcast_user_index_request(http_config, request_params)
-        path_template = "/api/users?per_page=%{per_page}&page=%{page}"
-        Socialcast::CommandLine.resource_for_path((path_template % request_params), http_config)
-      end
     end
   end
 end

data/lib/socialcast/command_line/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module CommandLine
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
   end
 end

data/spec/socialcast/command_line/cli_spec.rb

@@ -497,36 +497,5 @@ describe Socialcast::CommandLine::CLI do
         @result.should =~ /<label>manager_email<\/label>\s*<value>bossman@example.com<\/value>/
       end
     end
-
-    context "with a user marked for termination that shouldn't be and sanity_check option passed" do
-      before do
-        @entry = Net::LDAP::Entry.new("cn=Ryan,dc=example,dc=com")
-        @entry[:mail] = 'ryan@example.com'
-        @valid_entry = Net::LDAP::Entry.new("cn=Sean,dc=example,dc=com")
-        @valid_entry[:mail] = 'sean@example.com'
-        ldap_search_block = double("ldapsearchblock")
-        ldap_search_block.should_receive(:search).and_yield(@entry)
-        ldap_return = double("ldapreturn")
-        ldap_return.should_receive(:search).with(include(:filter => Net::LDAP::Filter.construct("(&(mail=sean@example.com)(mail=*))"))).and_return(@valid_entry)
-
-        Socialcast::CommandLine::LDAPConnector.any_instance.should_receive(:ldap).and_return(ldap_search_block, ldap_return)
-
-        @result = ''
-        Zlib::GzipWriter.stub(:open).and_yield(@result)
-        Socialcast::CommandLine::CLI.any_instance.should_receive(:ldap_config).and_return(ldap_default_config)
-        File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
-
-        Socialcast::CommandLine::Provision.any_instance.should_receive(:create_socialcast_user_index_request).and_return(
-          double("request1", :get => {"users" => [{"contact_info" => {"email" => @entry[:mail][0]}}]}.to_json),
-          double("request2", :get => {"users" => [{"contact_info" => {"email" => @valid_entry[:mail][0]}}]}.to_json),
-          double("empty_request", :get => {"users" => []}.to_json)
-        )
-
-        RestClient::Resource.any_instance.should_receive(:post).never
-      end
-      it 'does not post to Socialcast and throws Kernel.abort' do
-        lambda { Socialcast::CommandLine::CLI.start ['provision', '--sanity_check', true] }.should raise_error SystemExit
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,162 +10,162 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
@@ -186,14 +186,14 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: publish messages to your stream from a command line interface
@@ -204,11 +204,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - CONTRIBUTORS.txt
 - Gemfile
 - LICENSE.txt
@@ -259,12 +259,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []