chef_fixie 0.4.0 → 0.5.0

data/lib/chef_fixie/utility_helpers.rb

@@ -18,42 +18,46 @@
 # Author: Mark Anderson <mark@chef.io>
 #
 
-require_relative 'config'
-require_relative 'authz_objects'
-require_relative 'authz_mapper'
+require_relative "config"
+require_relative "authz_objects"
+require_relative "authz_mapper"
 
 module ChefFixie
   module UtilityHelpers
     def self.orgs
       @orgs ||= ChefFixie::Sql::Orgs.new
     end
+
     def self.users
       @users ||= ChefFixie::Sql::Users.new
     end
+
     def self.assocs
       @assocs ||= ChefFixie::Sql::Associations.new
     end
+
     def self.invites
       invites ||= ChefFixie::Sql::Invites.new
     end
 
     def self.make_user(user)
       if user.is_a?(String)
-        return users[user]
+        users[user]
       elsif user.is_a?(ChefFixie::Sql::User)
-        return user
+        user
       else
         raise Exception "Expected a user, got a #{user.class}"
       end
-    end      
+    end
+
     def self.make_org(org)
       if org.is_a?(String)
-        return orgs[org]
+        orgs[org]
       elsif org.is_a?(ChefFixie::Sql::Org)
-        return org
+        org
       else
         raise Exception "Expected an org, got a #{org.class}"
       end
-    end      
+    end
   end
 end

data/lib/chef_fixie/version.rb

@@ -1,3 +1,3 @@
 module ChefFixie
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/chef_fixie/acl_spec.rb

@@ -1,46 +1,45 @@
 
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::Sql::Orgs, "ACL access" do
-  let (:test_org_name) { "ponyville"}
+  let (:test_org_name) { "ponyville" }
   let (:orgs) { ChefFixie::Sql::Orgs.new }
   let (:users) { ChefFixie::Sql::Users.new }
   let (:test_org) { orgs[test_org_name] }
 
   # TODO this should use a freshly created object and purge it afterwords.
   # But we need to write the create object feature still
-  
+
   context "Fetch acl for actor (client)" do
     let (:testclient) { test_org.clients.all.first }
-    let (:testuser) { users['spitfire'] }
-    let (:pivotal) { users['pivotal'] }
+    let (:testuser) { users["spitfire"] }
+    let (:pivotal) { users["pivotal"] }
     let (:client_container) { test_org.containers["clients"] }
-    
+
     it "We can fetch the acl" do
       acl = testclient.acl
-      expect(acl.keys).to include(* %w(create read update delete grant))
+      expect(acl.keys).to include(* %w{create read update delete grant})
     end
 
     it "we can add a user to an ace" do
-# This requires either a temp object or good cleanup      
+# This requires either a temp object or good cleanup
 #      acl = testclient.acl
 #      expect(acl["read"]["actors"].not_to include("wonderbolts")
-      
+
       testclient.ace_add(:read, testuser)
 
       acl = testclient.acl
       expect(acl["read"]["actors"]).to include([:global, testuser.name])
     end
-    
+
     it "we can add then delete a user from an ace" do
       testclient.ace_add(:read, testuser)
       acl = testclient.acl
       expect(acl["read"]["actors"]).to include([:global, testuser.name])
 
-      
       testclient.ace_delete(:read, testuser)
 
       acl = testclient.acl
@@ -49,26 +48,26 @@ RSpec.describe ChefFixie::Sql::Orgs, "ACL access" do
 
     it "we can copy users from another acl" do
       testclient.ace_delete(:all, pivotal)
-            
+
       testclient.acl_add_from_object(client_container)
 
       acl = testclient.acl
-      %w(create read update delete grant).each do |action|
+      %w{create read update delete grant}.each do |action|
         expect(acl[action]["actors"]).to include([:global, pivotal.name])
       end
     end
-     
+
   end
 
   context "ACE Membership" do
-    
-    let (:admingroup) { test_org.groups['admins'] }
-    let (:testobject) { test_org.groups['admins'] }
-    let (:notadmingroup) { test_org.groups['clients'] }
-    let (:adminuser) { users['rainbowdash'] }
-    let (:notadminuser) { users['mary'] }
-    let (:pivotal) { users['pivotal'] }
-    
+
+    let (:admingroup) { test_org.groups["admins"] }
+    let (:testobject) { test_org.groups["admins"] }
+    let (:notadmingroup) { test_org.groups["clients"] }
+    let (:adminuser) { users["rainbowdash"] }
+    let (:notadminuser) { users["mary"] }
+    let (:pivotal) { users["pivotal"] }
+
     it "Privileged users and groups are part of the read ACE" do
       expect(testobject.ace_member?(:read, admingroup)).to be true
       expect(testobject.ace_member?(:read, pivotal)).to be true
@@ -79,5 +78,4 @@ RSpec.describe ChefFixie::Sql::Orgs, "ACL access" do
     end
   end
 
-
 end

data/spec/chef_fixie/assoc_invite_spec.rb

@@ -1,18 +1,17 @@
 
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::Sql::Associations, "Associations tests" do
   let (:test_org_name) { "ponyville" }
   let (:orgs) { ChefFixie::Sql::Orgs.new }
-  let (:test_org) { orgs[test_org_name]}
+  let (:test_org) { orgs[test_org_name] }
 
   let (:users) { ChefFixie::Sql::Users.new }
   let (:assocs) { ChefFixie::Sql::Associations.new }
 
-
   context "Basic functionality of association spec" do
     let ("test_user_name") { "fluttershy" }
     let ("test_user") { users[test_user_name] }
@@ -37,11 +36,9 @@ RSpec.describe ChefFixie::Sql::Associations, "Associations tests" do
       expect(assoc_item.org_id).to eq(test_org.id)
 
       # test user not in org
-      expect(assocs.by_org_id_user_id(test_org.id, users['mary'].id)).to be_nil
+      expect(assocs.by_org_id_user_id(test_org.id, users["mary"].id)).to be_nil
     end
 
-
   end
 
-
 end

data/spec/chef_fixie/check_org_associations_spec.rb

@@ -1,17 +1,17 @@
 # -*- indent-tabs-mode: nil; fill-column: 110 -*-
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
-  let (:test_org_name) { "ponyville"}
+  let (:test_org_name) { "ponyville" }
   let (:orgs) { ChefFixie::Sql::Orgs.new }
   let (:test_org) { orgs[test_org_name] }
 
   let (:users) { ChefFixie::Sql::Users.new }
-  let (:adminuser) { users['rainbowdash'] }
-  let (:notorguser) { users['mary'] }
+  let (:adminuser) { users["rainbowdash"] }
+  let (:notorguser) { users["mary"] }
 
   # TODO this should use a freshly created object and purge it afterwords.
   # But we need to write the create object feature still
@@ -29,10 +29,10 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
     end
 
     after :each do
-      usag =  test_org.groups[adminuser.id]
+      usag = test_org.groups[adminuser.id]
 
       usag.group_add(adminuser)
-      test_org.groups['users'].group_add(usag)
+      test_org.groups["users"].group_add(usag)
 
       adminuser.ace_add(:read, test_org.global_admins)
 
@@ -47,7 +47,7 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
 
     it "Detects user missing from usag" do
       # break it
-      usag =  test_org.groups[adminuser.id]
+      usag = test_org.groups[adminuser.id]
       usag.group_delete(adminuser)
 
       expect(ChefFixie::CheckOrgAssociations.check_association(test_org, adminuser)).to be :user_not_in_usag
@@ -55,8 +55,8 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
 
     it "Detects usag missing from users group" do
       # break it
-      usag =  test_org.groups[adminuser.id]
-      test_org.groups['users'].group_delete(usag)
+      usag = test_org.groups[adminuser.id]
+      test_org.groups["users"].group_delete(usag)
 
       expect(ChefFixie::CheckOrgAssociations.check_association(test_org, adminuser)).to be :usag_not_in_users
     end
@@ -78,10 +78,10 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
     end
 
     after :each do
-      usag =  test_org.groups[adminuser.id]
+      usag = test_org.groups[adminuser.id]
 
       usag.group_add(adminuser)
-      test_org.groups['users'].group_add(usag)
+      test_org.groups["users"].group_add(usag)
 
       adminuser.ace_add(:read, test_org.global_admins)
 
@@ -106,7 +106,7 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
     it "Fixes usag missing from users group" do
       # break it
       usag =  test_org.groups[adminuser.id]
-      test_org.groups['users'].group_delete(usag)
+      test_org.groups["users"].group_delete(usag)
 
       expect(ChefFixie::CheckOrgAssociations.fix_association(test_org, adminuser)).to be true
       expect(ChefFixie::CheckOrgAssociations.check_association(test_org, adminuser)).to be true
@@ -124,7 +124,6 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
 
   end
 
-
   # TODO Break the org and check it!
   context "Global org check" do
 
@@ -135,6 +134,4 @@ RSpec.describe ChefFixie::CheckOrgAssociations, "Association checker" do
 
   end
 
-  
-
 end

data/spec/chef_fixie/groups_spec.rb

@@ -1,11 +1,11 @@
 # -*- indent-tabs-mode: nil; fill-column: 110 -*-
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::Sql::Groups, "Group access" do
-  let (:test_org_name) { "ponyville"}
+  let (:test_org_name) { "ponyville" }
   let (:orgs) { ChefFixie::Sql::Orgs.new }
   let (:users) { ChefFixie::Sql::Users.new }
   let (:test_org) { orgs[test_org_name] }
@@ -14,9 +14,9 @@ RSpec.describe ChefFixie::Sql::Groups, "Group access" do
   # But we need to write the create object feature still
 
   context "Groups" do
-    let (:testgroup) { test_org.groups['admins'] }
-    let (:adminuser) { users['rainbowdash'] }
-    let (:notadminuser) { users['mary'] }
+    let (:testgroup) { test_org.groups["admins"] }
+    let (:adminuser) { users["rainbowdash"] }
+    let (:notadminuser) { users["mary"] }
 
     it "Members are part of the group" do
       expect(testgroup.member?(adminuser)).to be true
@@ -25,10 +25,6 @@ RSpec.describe ChefFixie::Sql::Groups, "Group access" do
       expect(testgroup.member?(notadminuser)).to be false
     end
 
-
   end
 
-
-
-
 end

data/spec/chef_fixie/org_spec.rb

@@ -1,13 +1,13 @@
 
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
   let (:test_org_name) { "ponyville" }
   let (:orgs) { ChefFixie::Sql::Orgs.new }
-  let (:test_org) { orgs[test_org_name]}
+  let (:test_org) { orgs[test_org_name] }
 
   context "Basic functionality of org accessor" do
 
@@ -22,5 +22,4 @@ RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
 
   end
 
-
 end

data/spec/chef_fixie/orgs_spec.rb

@@ -1,11 +1,11 @@
 
-require 'rspec'
+require "rspec"
 require "spec_helper"
-require 'chef_fixie'
-require 'chef_fixie/config'
+require "chef_fixie"
+require "chef_fixie/config"
 
 RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
-  let (:test_org) { "ponyville"}
+  let (:test_org) { "ponyville" }
 
   context "Basic access to orgs" do
     let (:orgs) { ChefFixie::Sql::Orgs.new }
@@ -15,7 +15,7 @@ RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
 
     it "We can list orgs" do
       # array matcher requires a splat. (I didn't know this )
-      expect(orgs.list).to include( * %w(acme ponyville wonderbolts) )
+      expect(orgs.list).to include( * %w{acme ponyville wonderbolts} )
     end
     it "We can list orgs with a limit" do
       # array matcher requires a splat. (I didn't know this )
@@ -38,7 +38,7 @@ RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
     end
 
     # TODO: Automatically extract this from the filter by field
-    %w(name, id, full_name, authz_id).each do |accessor|
+    %w{name, id, full_name, authz_id}.each do |accessor|
       it "We can access an org by #{accessor}" do
         expect(orgs.by_name(test_org).all.count).to eq(1)
         expect(orgs.by_name(test_org).all.first.name).to eq(the_org.name)
@@ -47,7 +47,4 @@ RSpec.describe ChefFixie::Sql::Orgs, "Organizations access" do
 
   end
 
-
-
-
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'chef_fixie/config'
+require "chef_fixie/config"
 
 def load_from_config_example
   # load from config file
@@ -13,7 +13,7 @@ def load_from_config_example
 end
 
 def load_from_opscode
-  ChefFixie::Config::instance.load_from_pc
+  ChefFixie::Config.instance.load_from_pc
 end
 
 RSpec.configure do |config|
@@ -24,7 +24,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   # configure specs
 
@@ -35,7 +35,6 @@ RSpec.configure do |config|
   # Horrible shameful hack TODO FIXME
   # We can't include a lot of the SQL code until we configure things, because
   # we inherit from Model e.g.
-  # class Users < Sequel::Model(:users) 
-  require 'chef_fixie'
+  # class Users < Sequel::Model(:users)
+  require "chef_fixie"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_fixie
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.12.2
+        version: '15.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.12.2
+        version: '15.2'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -120,20 +120,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Low level manipulation tool for Chef Server 12 and later