chef_fixie 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2d39d757f223a6cf8f364906e91d8051ce19a61
-  data.tar.gz: 8cbc7287d4ec7ac58e9a800fd1dd76b23b674d10
+SHA256:
+  metadata.gz: a42c53078d0d4728a6a2efa5e157d8aefee5d0672c530d61b2b50bc0694def17
+  data.tar.gz: cefac5cee97b8813b48237c4711a0aeab6f2975bd01e359d8c8151a54b5206c3
 SHA512:
-  metadata.gz: 6970a5ff33b2a6448b57584e5641a99c55837803a67d209b6246bbbe344466f51f445884f1c596f06429e30e27312c8755a93721b471b56043fc99c987b3545d
-  data.tar.gz: f1c93aba31fa3afc3cb3ba952539a052260a6a890b176bc45d0609aaa471182e74f4011b14a3e104b5def87a40c21562bf5a5eb6d777d3e016ef1835e13cdd6d
+  metadata.gz: e6153d4cb98e6f62ac9148d6ba373edd770fa4e19253f41d4da25777f53a68a5f8b2424d0d3a531bf7cef0d1f568bbfca24ea7560af4fb8588c295bb1b63f342
+  data.tar.gz: 2d14e3079d2142adfdf6b61c414ca195f3a05c7fa9fd847995bce4962c78f37f32d6c28a2eff17a54abdb0f8e670e5982a85cf81df81f913dff85e3f98aa6305

data/doc/CommonTasks.md

@@ -9,12 +9,23 @@ points
 
 First of all, run the automated org association checker:
 
-fixie:0 > Fixie::CheckOrgAssociations.check_associations("acme")
-Org acme is ok (6 users)
+    fixie:0 > Fixie::CheckOrgAssociations.check_associations("acme")
+    Org acme is ok (6 users)
 
 If it reports a problem with a user, you may be able to fix it
 automatically:
 
-fixie:0 > Fixie::CheckOrgAssociations.fix_association("acme", "mary")
+    fixie:0 > Fixie::CheckOrgAssociations.fix_association("acme", "mary")
 
 This might need to be run multiple times to fix all of the errors.
+
+
+Removing a user completely from an org
+-----------
+
+    [1] fixie(main)> ChefFixie::CheckOrgAssociations.remove_association('the_org', 'the_user')
+
+This removes the user from the org, and removes them from all org
+groups. However, if the user has been individually added to an ACL we
+don't fix that up; it would require enumeration of the whole org, and
+that hasn't been implemented.

data/lib/chef_fixie/check_org_associations.rb

@@ -57,6 +57,13 @@ module ChefFixie
       end
     end
 
+    def usag_for_user(org, user)
+      user = make_user(user)
+      org = make_org(org)
+      org.groups[user.id]
+
+    end
+
     def self.check_association(org, user, global_admins = nil)
       # magic to make usage easier
       org = make_org(org)
@@ -201,41 +208,31 @@ module ChefFixie
       end
       return true
     end
-
-
-    ## TODO: Port this
+    
     def self.remove_association(org, user)
       # magic to make usage easier
-      org = orgs[org] if org.is_a?(String)
-      user = users[user] if user.is_a?(String)
-
+      org = make_org(org)
+      user = make_user(user)
+      
       # remove USAG
-      delete_usag_for_user(orgname,username)
+      usag = org.groups[user.id]
+      usag.delete if usag
 
+      # remove from any groups they are in
+      org.groups.all(:all).each do |g|
+        g.group_delete(user) if g.member?(user)
+      end
+      
       # remove read ACE
-      u_aid =  user.authz_id
-      ga = OrgMapper::CouchSupport.doc_from_view("#{orgname}_global_admins", "#{Group}/by_groupname")
-      ga_aid = user_to_authz(ga["_id"])
-
-      read_ace = OrgMapper::RawAuth.get("actors/#{u_aid}/acl/read")
-      read_ace["groups"] -= [ga_aid]
-      OrgMapper::RawAuth.put("actors/#{u_aid}/acl/read", read_ace)
+      user.ace_delete(:read, org.global_admins)
 
       # remove association record
+      assoc = assocs.by_org_id_user_id(org.id,user.id)
+      assoc.delete if assoc
 
-      org_assoc = OrgMapper::CouchSupport.associations_for_org(orgname)
-      doc = org_assoc.select {|x| x[:uid] == user.id}.first
-
-      OrgMapper::CouchSupport.delete_account_doc(doc[:id])
-
-      # clean up excess invites
-      invites = OrgMapper::CouchSupport.invites_for_org(orgname)
-      invite_map = invites.inject({}) {|a,e| a[e[:name]] = e; a}
-
-      if invite_map.has_key?(username)
-        invite = invite_map[username]
-        OrgMapper::CouchSupport.delete_account_doc(invite[:id])
-      end
+      # remove any invites
+      invite = invites.by_org_id_user_id(org.id,user.id)
+      invite.delete if invite
     end
   end
 end

data/lib/chef_fixie/config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014-2015 Chef Software Inc. 
+# Copyright (c) 2014-2015 Chef Software Inc.
 # License :: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
 require 'singleton'
 require 'ffi_yajl'
 require 'pathname'
+require 'veil'
 
 module ChefFixie
   def self.configure
@@ -29,11 +30,11 @@ module ChefFixie
 
   def self.load_config(config_file = nil)
     if config_file
-      puts "loading config: #{config_file}..."
+      puts "loading config: #{config_file}..." if ChefFixie::Console.started_from_command_line?
       Kernel.load(config_file)
     else
       path = "/etc/opscode"
-      puts "loading config from #{path}"
+      puts "loading config from #{path}" if ChefFixie::Console.started_from_command_line?
       ChefFixie::Config.instance.load_from_pc(path)
     end
   end
@@ -104,23 +105,25 @@ module ChefFixie
       config_files = %w(chef-server-running.json)
       config = load_json_from_path([configdir], config_files)
 
+      secrets = load_secrets_from_path([configdir], %w(private-chef-secrets.json) )
+
       authz_config = config['private_chef']['oc_bifrost']
       authz_vip = authz_config['vip']
       authz_port = authz_config['port']
       @authz_uri = "http://#{authz_vip}:#{authz_port}"
-      
-      @superuser_id = authz_config['superuser_id']
+
+      @superuser_id = dig(secrets,['oc_bifrost','superuser_id']) || authz_config['superuser_id']
 
       sql_config = config['private_chef']['postgresql']
       erchef_config = config['private_chef']['opscode-erchef']
-      
+
       sql_user = sql_config['sql_user'] || erchef_config['sql_user']
-      sql_pw = sql_config['sql_password'] || erchef_config['sql_password']
+      sql_pw = dig(secrets, ['opscode_erchef', 'sql_password']) || sql_config['sql_password'] || erchef_config['sql_password']
       sql_vip = sql_config['vip']
       sql_port = sql_config['port']
-      
+
       @sql_database = "postgres://#{sql_user}:#{sql_pw}@#{sql_vip}/opscode_chef"
-      
+
       @pivotal_key = configdir + "pivotal.pem"
     end
 
@@ -136,5 +139,35 @@ module ChefFixie
         end
       end
     end
+    def load_secrets_from_path(pathlist, filelist)
+      pathlist.each do |path|
+        filelist.each do |file|
+          configfile = path + file
+          if configfile.file?
+            data = Veil::CredentialCollection::ChefSecretsFile.from_file(configfile)
+            return data
+          end
+        end
+      end
+      nil
+    end
+
+    def dig(hash, list)
+      if hash.respond_to?(:get)
+        hash.get(*list)
+      elsif hash.nil?
+        nil?
+      elsif list.empty?
+        hash
+      else
+        element = list.shift
+        if hash.has_key?(element)
+          dig(hash[element], list)
+        else
+          nil
+        end
+      end
+    end
+
   end
 end

data/lib/chef_fixie/console.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Chef Software Inc. 
+# Copyright (c) 2015 Chef Software Inc.
 # License :: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,7 @@ module ChefFixie
     extend self
 
     def start
+      @@started_from_command_line = true
       configure
       ChefFixie.setup
       configure_pry
@@ -87,5 +88,9 @@ HALP
       end
     end
 
+    def started_from_command_line?
+      @@started_from_command_line == true
+    end
+
   end
 end

data/lib/chef_fixie/sql_objects.rb

@@ -145,9 +145,13 @@ module ChefFixie
       def global_admins
         name = self.name
         global_admins_name = "#{name}_global_admins"
-        ChefFixie::Sql::Groups.new["#{name}_global_admins"]
+        read_access_name = "#{name}_read_access_group"
+        ChefFixie::Sql::Groups.new[global_admins_name] || \
+          ChefFixie::Sql::Groups.new[read_access_name]
       end
 
+      alias read_access_group global_admins
+
       # Iterators for objects in authz; using containers to enumerate things
       # It might be better to metaprogram this up instead,
       #

data/lib/chef_fixie/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_fixie
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -106,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
+- !ruby/object:Gem::Dependency
+  name: veil
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,42 +172,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/bundler
-- bin/chef-apply
-- bin/chef-client
-- bin/chef-shell
-- bin/chef-solo
-- bin/chef-zero
 - bin/chef_fixie
-- bin/coderay
-- bin/edit_json.rb
-- bin/erubis
-- bin/ffi-yajl-bench
-- bin/fixie~
-- bin/htmldiff
-- bin/knife
-- bin/ldiff
-- bin/net-dhcp
-- bin/ohai
-- bin/prettify_json.rb
-- bin/pry
-- bin/rackup
-- bin/rake
-- bin/rdoc
-- bin/restclient
-- bin/ri
-- bin/rspec
-- bin/s3sh
-- bin/sequel
-- bin/serverspec-init
 - doc/AccessingSQL.md
-- doc/AccessingSQL.md~
 - doc/BulkFixup.md
-- doc/BulkFixup.md~
 - doc/CommonTasks.md
-- doc/CommonTasks.md~
 - doc/GETTING_STARTED.md
-- doc/GETTING_STARTED.md~
 - fixie.conf.example
 - lib/chef_fixie.rb
 - lib/chef_fixie/authz_mapper.rb
@@ -209,12 +192,9 @@ files:
 - lib/chef_fixie/version.rb
 - spec/chef_fixie/acl_spec.rb
 - spec/chef_fixie/assoc_invite_spec.rb
-- spec/chef_fixie/assoc_invite_spec.rb~
 - spec/chef_fixie/check_org_associations_spec.rb
-- spec/chef_fixie/check_org_associations_spec.rb~
 - spec/chef_fixie/groups_spec.rb
 - spec/chef_fixie/org_spec.rb
-- spec/chef_fixie/org_spec.rb~
 - spec/chef_fixie/orgs_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/chef/fixie
@@ -237,18 +217,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Low level manipulation tool for Chef Server 12 and later
 test_files:
 - spec/chef_fixie/acl_spec.rb
 - spec/chef_fixie/assoc_invite_spec.rb
-- spec/chef_fixie/assoc_invite_spec.rb~
 - spec/chef_fixie/check_org_associations_spec.rb
-- spec/chef_fixie/check_org_associations_spec.rb~
 - spec/chef_fixie/groups_spec.rb
 - spec/chef_fixie/org_spec.rb
-- spec/chef_fixie/org_spec.rb~
 - spec/chef_fixie/orgs_spec.rb
 - spec/spec_helper.rb

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('bundler', 'bundler')

data/bin/chef-apply

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-apply' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef', 'chef-apply')

data/bin/chef-client

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-client' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef', 'chef-client')

data/bin/chef-shell

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-shell' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef', 'chef-shell')

data/bin/chef-solo

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-solo' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef', 'chef-solo')

data/bin/chef-zero

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-zero' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef-zero', 'chef-zero')

data/bin/coderay

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'coderay' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('coderay', 'coderay')

data/bin/edit_json.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'edit_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json', 'edit_json.rb')

data/bin/erubis

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'erubis' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('erubis', 'erubis')

data/bin/ffi-yajl-bench

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ffi-yajl-bench' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('ffi-yajl', 'ffi-yajl-bench')

data/bin/fixie~

@@ -1,231 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "bundler/setup"
-
-$:.unshift(File.dirname(__FILE__) + '/../lib/')
-
-require 'optparse'
-require 'irb'
-require 'irb/init'
-require 'irb/completion'
-require 'irb/ext/history'
-require 'pp'
-require 'pry'
-
-require 'fixie/config'
-
-require 'fixie'
-
-# IRB tries to overwrite our custom settings when it loads, so we have to hax0r
-# it to work.
-module IRB
-  class << self
-    alias :run_original_config :run_config
-
-    def run_config
-      run_original_config
-      ::Fixie::Console.configure_irb
-    end
-  end
-end
-
-
-module Fixie
-
-  module Context
-
-    def describe_orgs
-      OrgMetrics.org_stats(orgs)
-    end
-
-    def orgs
-      Fixie::Organizations.new
-    end
-
-    def jobs
-      Fixie::Jobs.new
-    end
-
-    def users
-      Fixie::Users.new
-    end
-
-    def global_groups
-      Fixie::GlobalGroups.new
-    end
-
-    def help
-      puts(<<-HALP)
-** ORGS **
-* access with ORGS or ORGS
-* access a specific org: ORGS['orgname']
-
-** USERS **
-* users.find('clownco-org-admin')
-* users.grep :clownco
-* users.usernames
-
-** RAW SQL ACCESS**
-* sql[:users].select(:column, :column).where(:column => "condition").all
-
-** irb Help **
-irb_help
-
-HALP
-      :COOL_STORY_BRO
-    end
-
-    def sql
-      Opscode::Mappers.default_connection
-    end
-
-    def associate_user(username, orgname)
-      unless user = users.find(username)
-        raise ArgumentError, "No users matched '#{username}'"
-      end
-      unless org = ORGS[orgname]
-        raise ArgumentError, "No orgs matched '#{orgname}'"
-      end
-
-      Fixie::Associator.associate_user(org, user)
-    end
-
-    def dissociate_user(username, orgname)
-      unless user = users.find(username)
-        raise ArgumentError, "No users matched '#{username}'"
-      end
-      unless org = ORGS[orgname]
-        raise ArgumentError, "No orgs matched '#{orgname}'"
-      end
-
-      Fixie::Dissociator.dissociate_user(org, user)
-    end
-
-  end
-
-  module Console
-    extend self
-
-    def irb_conf
-      IRB.conf
-    end
-
-    def start
-      # FUGLY HACK: irb gives us no other choice.
-      irb_help = [:help, :irb_help, IRB::ExtendCommandBundle::NO_OVERRIDE]
-      IRB::ExtendCommandBundle.instance_variable_get(:@ALIASES).delete(irb_help)
-
-      # This has to come before IRB.setup b/c IRB.setup eats ARGV.
-      configure
-
-      # HACK: this duplicates the functions of IRB.start, but we have to do it
-      # to get access to the main object before irb starts.
-      ::IRB.setup(nil)
-
-      irb = IRB::Irb.new
-
-      setup(irb.context.main)
-
-
-      irb_conf[:IRB_RC].call(irb.context) if irb_conf[:IRB_RC]
-      irb_conf[:MAIN_CONTEXT] = irb.context
-
-      trap("SIGINT") do
-        irb.signal_handle
-      end
-
-      catch(:IRB_EXIT) do
-        irb.eval_input
-      end
-    end
-
-    def configure
-
-      if ARGV.first && ARGV[0].chars.first != "-" && config_file = ARGV.shift
-        config_file = File.expand_path(config_file)
-
-        load_config_file = true
-      end
-
-      options = {}
-      OptionParser.new do |opt|
-        opt.banner = "Usage: orgmapper [config] [options]"
-        opt.on('--couchdb-uri COUCH_URI', 'The URI of the couchdb server to connect to') { |v| options[:couchdb_uri] = v }
-        opt.on("--database ACCOUNT_DATABASE", 'The name of the opscode account database') { |v| options[:database] = v }
-        opt.on('--auth-uri AUTH_URI', "The URI of the opscode authz service") { |v| options[:auth_uri] =v }
-        opt.on_tail('-h', '--help', 'Show this message') do
-          puts opt
-          puts "\nExample configuration file:\n\n"
-          puts Fixie::Config.instance.example_config
-          puts "\n"
-          exit(1)
-        end
-        opt.parse!(ARGV)
-      end
-      pp :cli_opts => options if ENV["DEBUG"]
-
-      if load_config_file
-        puts "loading config: #{config_file}..."
-        Kernel.load(config_file)
-      end
-
-      Fixie::Config.instance.merge_opts(options)
-      puts Fixie::Config.instance.to_text
-    end
-
-    def setup(context)
-      Object.send(:include, Mixlib::Authorization::AuthHelper)
-      Object.const_set(:PLATFORM_BACKEND, Fixie::Backend.new(*Config.instance.to_ary))
-      Object.const_set(:ORGS, Fixie::Organizations.new)
-      Object.const_set(:JOBS, Fixie::Jobs.new)
-      Object.const_set(:USERS, Fixie::Users.new)
-      Object.const_set(:GLOBAL_GROUPS, Fixie::GlobalGroups.new)
-
-      context.extend(Context)
-
-    end
-
-    # Configure IRB how we like it. This needs to be hooked into IRB.run_config
-      Object.send(:include, Mixlib::Authorization::AuthHelper)
-      Object.const_set(:PLATFORM_BACKEND, Fixie::Backend.new(*Config.instance.to_ary))
-      Object.const_set(:ORGS, Fixie::Organizations.new)
-      Object.const_set(:JOBS, Fixie::Jobs.new)
-      Object.const_set(:USERS, Fixie::Users.new)
-      Object.const_set(:GLOBAL_GROUPS, Fixie::GlobalGroups.new)
-
-      context.extend(Context)
-
-    end
-
-    # Configure IRB how we like it. This needs to be hooked into IRB.run_config
-    # because much of IRB's code is anachronistic
-    def configure_irb
-      IRB.init_config(__FILE__)
-
-      IRB.conf[:HISTORY_FILE] = "~/.orgmapper_history"
-      IRB.conf[:SAVE_HISTORY]=1000
-      IRB.conf[:USE_READLINE]=true
-      IRB.conf[:PROMPT][:ORGMAPPER] = { # name of prompt mode
-        :PROMPT_I => "orgmapper:%i > ", # normal prompt
-        :PROMPT_S => "..%l ",   # prompt for continuing strings
-        :PROMPT_C => "... ",    # prompt for continuing statement
-        :RETURN => "%s\n"  # format to return value
-      }
-
-      IRB.conf[:PROMPT_MODE] = :ORGMAPPER
-
-      begin
-        require 'wirble'
-        Wirble.init
-        Wirble.colorize
-      rescue LoadError
-      end
-
-    end
-
-  end
-end
-
-Fixie::Console.start
-

data/bin/htmldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/knife

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'knife' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('chef', 'knife')

data/bin/ldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/net-dhcp

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'net-dhcp' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('net-dhcp', 'net-dhcp')

data/bin/ohai

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ohai' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('ohai', 'ohai')

data/bin/prettify_json.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'prettify_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json', 'prettify_json.rb')

data/bin/pry

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'pry' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('pry', 'pry')

data/bin/rackup

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rackup' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/rdoc

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rdoc' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rdoc', 'rdoc')

data/bin/restclient

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'restclient' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rest-client', 'restclient')

data/bin/ri

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ri' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rdoc', 'ri')

data/bin/rspec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')

data/bin/s3sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 's3sh' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('aws-s3', 's3sh')

data/bin/sequel

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sequel' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('sequel', 'sequel')

data/bin/serverspec-init

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'serverspec-init' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('serverspec', 'serverspec-init')

data/doc/AccessingSQL.md~

@@ -1,32 +0,0 @@
-
-Basics:
--------
-
-Underneath everything is the Ruby Sequel library; there are a number
-of ways to access it.
-
-
-
-fixie:0 > o.groups.by_name(cl.id).inner.count
-1
-fixie:0 > o.groups.by_name(cl.id).inner.delete
-1
-fixie:0 > o.groups.by_name(cl.id).inner.count     
-
-
-* Changing email for user in fixie
-
-USERS.by_username('anujbiyani').inner.update(:email=>"anujbiyani01@gmail.com")
-
-
-
-* Adding a record
-```ruby
-u=USERS['a_username']
-o=ORGS['an_org']
-
-pivotal = USERS['pivotal']
-
-ASSOCS.inner.insert(:org_id=>o.id, :user_id=>u.id, :last_updated_by=>pivotal.authz_id,
-	:created_at=>:NOW.sql_function, :updated_at=>:NOW.sql_function) )
-```

data/doc/BulkFixup.md~

@@ -1,28 +0,0 @@
-Restoring acl permissions globally
-============
-
-
-
-
-* If a key group is deleted (such as users)
-
-Create/restore the group
-
-Add the users/groups back to the group
-
-Set the group ACL appropriately
-
-Restore users to the appropriate container ACLs
-```ruby
-o = ORGS[THE_ORG]
-cl = %w(cookbooks data nodes roles environments policies policy_groups cookbook_artifacts)
-cl.each {|c| o.containers[c].ace_add([:create,:read,:update,:delete], o.groups['users']) }
-%w(clients).each { |c| o.containers[c].ace_add([:read,:delete], o.groups['users']) }
-%w(groups containers).each { |c| o.containers[c].ace_add([:read], o.groups['users']) }
-%w(sandboxes).each { |c| o.containers[c].ace_add([:create], o.groups['users']) }
-```
-
-Then update the objects from the containers:
-```ruby
-Fixie::BulkEditPermissions::copy_from_containers(o)
-```

data/doc/GETTING_STARTED.md~

@@ -1,6 +0,0 @@
-
-Installing fixie 
--------
-
-Configuring fixie
--------

data/spec/chef_fixie/assoc_invite_spec.rb~

@@ -1,26 +0,0 @@
-
-require 'rspec'
-require "spec_helper"
-require 'fixie'
-require 'fixie/config'
-
-RSpec.describe Fixie::Sql::Orgs, "Organizations access" do
-  let (:test_org_name) { "ponyville" }
-  let (:orgs) { Fixie::Sql::Orgs.new }
-  let (:test_org) { orgs[test_org_name]}
-
-  context "Basic functionality of org accessor" do
-
-    it "Org has a name and id" do
-      expect(test_org.name).to eq(test_org_name)
-      expect(test_org.id).not_to be_nil
-    end
-
-    it "Org has a global admins group" do
-      expect(test_org.global_admins.name).to eq(test_org_name + "_global_admins")      
-    end
-    
-  end
-
-
-end

data/spec/chef_fixie/check_org_associations_spec.rb~

@@ -1,34 +0,0 @@
-
-require 'rspec'
-require "spec_helper"
-require 'fixie'
-require 'fixie/config'
-
-RSpec.describe Fixie::Sql::Groups, "Group access" do
-  let (:test_org_name) { "ponyville"}
-  let (:orgs) { Fixie::Sql::Orgs.new }
-  let (:users) { Fixie::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 "Groups" do
-    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
-    end
-    it "Members are not part of the group" do
-      expect(testgroup.member?(notadminuser)).to be false
-    end
-
-     
-  end
-
-
-
-
-end

data/spec/chef_fixie/org_spec.rb~

@@ -1,53 +0,0 @@
-
-require 'rspec'
-require "spec_helper"
-require 'fixie'
-require 'fixie/config'
-
-RSpec.describe Fixie::Sql::Orgs, "Organizations access" do
-  let (:test_org) { "ponyville"}
-
-  context "Basic access to orgs" do
-    let (:orgs) { Fixie::Sql::Orgs.new }
-    it "We find more than one org" do
-      expect(orgs.inner.count).to be > 0
-    end
-
-    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) )
-    end
-    it "We can list orgs with a limit" do
-      # array matcher requires a splat. (I didn't know this )
-      expect(orgs.list(1)).to eq(:too_many_results)
-    end
-
-    it "We can find an org" do
-      expect(orgs[test_org].name).to eq(test_org)
-    end
-
-  end
-
-  context "Search accessors work correctly" do
-    let (:orgs) { Fixie::Sql::Orgs.new }
-    let (:the_org) { orgs[test_org] }
-
-    it "We can find an org by name" 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)
-    end
-
-    # TODO: Automatically extract this from the filter by field
-    %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)
-      end
-    end
-
-  end
-
-
-
-
-end