Merge pull request #67 from chef/dheeraj/fix-the-fixie

fix the fixie

.expeditor/verify.pipeline.yml

@@ -11,13 +11,13 @@ expeditor:
 
 steps:
 
-- label: run-lint-and-specs-ruby-2.6
+- label: run-lint-and-specs-ruby-3.0
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-buster
+        image: ruby:3.0-buster
 
 - label: run-lint-and-specs-ruby-2.7
   command:

Gemfile

@@ -1,6 +1,6 @@
-source :rubygems
+source "https://rubygems.org"
 
-gem "veil", git: "https://github.com/chef/chef_secrets", branch: "main"
+gem "veil"
 gemspec
 
 # TODO: remove when we drop ruby 2.6

doc/GETTING_STARTED.md

@@ -26,7 +26,7 @@ Running fixie
 
 Start fixie with
 ```shell
-bin/fixie fixie.conf
+bin/chef_fixie fixie.conf
 ```
 The config file is optional, leaving it out will attempt to read
 /etc/opscode for configuration.

fixie.conf.example

@@ -1,5 +1,5 @@
 
-Fixie.configure do |mapper|
+ChefFixie.configure do |mapper|
   mapper.authz_uri = "http://localhost:9463"
   mapper.superuser_id = "33d88ba14277f812a3ef3989869fb393"
   mapper.sql_database = 'postgres://opscode_chef:6c6e1a140828be4ac406848e0b6a2ae1e9845e45ac4f48c790168c681c1b4217dc27ab99599130449a2437ab0d2a300bed5d@localhost/opscode_chef'

lib/chef_fixie/config.rb

@@ -22,6 +22,7 @@
 require "ffi_yajl"
 require "pathname"
 require "veil"
+require_relative "console"
 
 module ChefFixie
   def self.configure

lib/chef_fixie/console.rb

@@ -29,8 +29,9 @@ module ChefFixie
   module Console
     extend self
 
+    @@started_from_command_line = true
+
     def start
-      @@started_from_command_line = true
       configure
       ChefFixie.setup
       configure_pry
@@ -65,7 +66,7 @@ def configure
     end
 
     def configure_pry
-      Pry.config.history.file = "~/.fixie_history"
+      Pry.config.history_file = "~/.fixie_history"
       Pry.config.prompt_name = "fixie"
       Pry::Commands.block_command("fixie-help", "Show fixie's help") do
         output.puts(<<-HALP)