Fixed all chefstyling and update configuration

Signed-off-by: piyushawasthi <[email protected]>

.rubocop.yml

@@ -1,35 +1,6 @@
-AllCops:
-  Exclude:
-    - "spec/data/**/*"
-    - "vendor/**/*"
-    - "pkg/**/*"
-    - "chef-config/pkg/**/*"
-Security/Eval:
-  Enabled: false
-Lint/UselessAssignment:
-  Enabled: false
-Lint/DeprecatedClassMethods:
-  Enabled: false
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-Lint/AssignmentInCondition:
-  Enabled: false
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-Lint/UnneededSplatExpansion:
-  Enabled: false
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-Lint/EmptyWhen:
-  Enabled: false
-Lint/IneffectiveAccessModifier:
-  Enabled: false
-Lint/ShadowedException:
-  Enabled: false
-Layout/AlignHash:
-  Enabled: true
-  EnforcedLastArgumentHashStyle: ignore_implicit
-Layout/EndOfLine:
-  Enabled: false
+# AllCops:
+#   Exclude:
+#     - "spec/data/**/*"
+#     - "vendor/**/*"
+#     - "pkg/**/*"
+#     - "chef-config/pkg/**/*"

.travis.yml

@@ -21,10 +21,8 @@ matrix:
   allow_failures:
     - rvm: ruby-head
 
-script:
-  - bundle exec rake spec
-  - bundle exec rake style
-
 branches:
   only:
-  - master
+  - master
+
+script: bundle exec rake

Rakefile

@@ -7,8 +7,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList["spec/**/**/*_spec.rb"].to_a
 end
 
-task :default => :spec
-
 begin
   require "chefstyle"
   require "rubocop/rake_task"
@@ -18,3 +16,5 @@ begin
 rescue LoadError
   puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
 end
+
+task default: [:spec, :style]

lib/win32-certstore.rb

@@ -1,18 +1,18 @@
-#
-# Author:: Nimisha Sharad (<[email protected]>)
-# Copyright:: Copyright (c) 2017 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require_relative "win32/certstore"
+#
+# Author:: Nimisha Sharad (<[email protected]>)
+# Copyright:: Copyright (c) 2017 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "win32/certstore"

lib/win32/certstore.rb

@@ -1,129 +1,129 @@
-#
-# Author:: Nimisha Sharad (<[email protected]>)
-# Copyright:: Copyright (c) 2017 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require_relative "certstore/mixin/crypto"
-require_relative "certstore/mixin/assertions"
-require_relative "certstore/mixin/helper"
-require_relative "certstore/mixin/string"
-require_relative "certstore/store_base"
-require_relative "certstore/version"
-
-module Win32
-  class Certstore
-    include Win32::Certstore::Mixin::Crypto
-    extend Win32::Certstore::Mixin::Assertions
-    include Win32::Certstore::Mixin::String
-    include Win32::Certstore::StoreBase
-
-    attr_reader :store_name
-
-    def initialize(store_name)
-      @certstore_handler = open(store_name)
-    end
-
-    # To open given certificate store
-    def self.open(store_name)
-      validate_store(store_name)
-      if block_given?
-        yield new(store_name)
-      else
-        new(store_name)
-      end
-    end
-
-    # Adds a new certificate to an open certificate store
-    # @param request [Object] of certificate in OpenSSL::X509::Certificate.new format
-    # @return [true, false] only true or false
-    def add(certificate_obj)
-      cert_add(certstore_handler, certificate_obj)
-    end
-
-    # Return `OpenSSL::X509` certificate object
-    # @param request [thumbprint<string>] of certificate
-    # @return [Object] of certificates in OpenSSL::X509 format
-    def get(certificate_thumbprint)
-      cert_get(certificate_thumbprint)
-    end
-
-    # Returns all the certificates in a store
-    # @param [nil]
-    # @return [Array] array of certificates list
-    def list
-      cert_list(certstore_handler)
-    end
-
-    # Delete existing certificate from open certificate store
-    # @param request [thumbprint<string>] of certificate
-    # @return [true, false] only true or false
-    def delete(certificate_thumbprint)
-      cert_delete(certstore_handler, certificate_thumbprint)
-    end
-
-    # Returns all matching certificates in a store
-    # @param request[search_token<string>] attributes of certificates as: CN, RDN, Friendly Name and other attributes
-    # @return [Array] array of certificates list
-    def search(search_token)
-      cert_search(certstore_handler, search_token)
-    end
-
-    # Validates a certificate in a certificate store on the basis of time validity
-    # @param request[thumbprint<string>] of certificate
-    # @return [true, false] only true or false
-    def valid?(certificate_thumbprint)
-      cert_validate(certificate_thumbprint)
-    end
-
-    # To close and destroy pointer of open certificate store handler
-    def close
-      closed = CertCloseStore(@certstore_handler, CERT_CLOSE_STORE_FORCE_FLAG)
-      unless closed
-        last_error = FFI::LastError.error
-        raise SystemCallError.new("Unable to close the Certificate Store.", last_error)
-      end
-      remove_finalizer
-    end
-
-    private
-
-    attr_reader :certstore_handler
-
-    # To open certstore and return open certificate store pointer
-    def open(store_name)
-      certstore_handler = CertOpenSystemStoreW(nil, wstring(store_name))
-      unless certstore_handler
-        last_error = FFI::LastError.error
-        raise SystemCallError.new("Unable to open the Certificate Store `#{store_name}`.", last_error)
-      end
-      add_finalizer(certstore_handler)
-      certstore_handler
-    end
-
-    # Get all open certificate store handler
-    def add_finalizer(certstore_handler)
-      ObjectSpace.define_finalizer(self, self.class.finalize(certstore_handler))
-    end
-
-    def self.finalize(certstore_handler)
-      proc { "#{certstore_handler}" }
-    end
-
-    # To close all open certificate store at the end
-    def remove_finalizer
-      ObjectSpace.undefine_finalizer(self)
-    end
-  end
-end
+#
+# Author:: Nimisha Sharad (<[email protected]>)
+# Copyright:: Copyright (c) 2017 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "certstore/mixin/crypto"
+require_relative "certstore/mixin/assertions"
+require_relative "certstore/mixin/helper"
+require_relative "certstore/mixin/string"
+require_relative "certstore/store_base"
+require_relative "certstore/version"
+
+module Win32
+  class Certstore
+    include Win32::Certstore::Mixin::Crypto
+    extend Win32::Certstore::Mixin::Assertions
+    include Win32::Certstore::Mixin::String
+    include Win32::Certstore::StoreBase
+
+    attr_reader :store_name
+
+    def initialize(store_name)
+      @certstore_handler = open(store_name)
+    end
+
+    # To open given certificate store
+    def self.open(store_name)
+      validate_store(store_name)
+      if block_given?
+        yield new(store_name)
+      else
+        new(store_name)
+      end
+    end
+
+    # Adds a new certificate to an open certificate store
+    # @param request [Object] of certificate in OpenSSL::X509::Certificate.new format
+    # @return [true, false] only true or false
+    def add(certificate_obj)
+      cert_add(certstore_handler, certificate_obj)
+    end
+
+    # Return `OpenSSL::X509` certificate object
+    # @param request [thumbprint<string>] of certificate
+    # @return [Object] of certificates in OpenSSL::X509 format
+    def get(certificate_thumbprint)
+      cert_get(certificate_thumbprint)
+    end
+
+    # Returns all the certificates in a store
+    # @param [nil]
+    # @return [Array] array of certificates list
+    def list
+      cert_list(certstore_handler)
+    end
+
+    # Delete existing certificate from open certificate store
+    # @param request [thumbprint<string>] of certificate
+    # @return [true, false] only true or false
+    def delete(certificate_thumbprint)
+      cert_delete(certstore_handler, certificate_thumbprint)
+    end
+
+    # Returns all matching certificates in a store
+    # @param request[search_token<string>] attributes of certificates as: CN, RDN, Friendly Name and other attributes
+    # @return [Array] array of certificates list
+    def search(search_token)
+      cert_search(certstore_handler, search_token)
+    end
+
+    # Validates a certificate in a certificate store on the basis of time validity
+    # @param request[thumbprint<string>] of certificate
+    # @return [true, false] only true or false
+    def valid?(certificate_thumbprint)
+      cert_validate(certificate_thumbprint)
+    end
+
+    # To close and destroy pointer of open certificate store handler
+    def close
+      closed = CertCloseStore(@certstore_handler, CERT_CLOSE_STORE_FORCE_FLAG)
+      unless closed
+        last_error = FFI::LastError.error
+        raise SystemCallError.new("Unable to close the Certificate Store.", last_error)
+      end
+      remove_finalizer
+    end
+
+    def self.finalize(certstore_handler)
+      proc { certstore_handler.to_s }
+    end
+
+    private
+
+    attr_reader :certstore_handler
+
+    # To open certstore and return open certificate store pointer
+    def open(store_name)
+      certstore_handler = CertOpenSystemStoreW(nil, wstring(store_name))
+      unless certstore_handler
+        last_error = FFI::LastError.error
+        raise SystemCallError.new("Unable to open the Certificate Store `#{store_name}`.", last_error)
+      end
+      add_finalizer(certstore_handler)
+      certstore_handler
+    end
+
+    # Get all open certificate store handler
+    def add_finalizer(certstore_handler)
+      ObjectSpace.define_finalizer(self, self.class.finalize(certstore_handler))
+    end
+
+    # To close all open certificate store at the end
+    def remove_finalizer
+      ObjectSpace.undefine_finalizer(self)
+    end
+  end
+end

lib/win32/certstore/mixin/shell_out.rb

@@ -69,7 +69,7 @@ def powershell_out!(*command_args)
         def run_command_with_os_architecture(script, options)
           options ||= {}
           options = options.dup
-          arch = options.delete(:architecture)
+          # arch = options.delete(:architecture)
 
           shell_out_command(
             build_powershell_command(script),