knife-essentials 1.2.1 → 1.3

data/lib/chef_fs/config.rb

@@ -100,7 +100,13 @@ module ChefFS
 
     # The current directory, relative to server root
     def base_path
-      @base_path ||= server_path(File.expand_path(@cwd))
+      @base_path ||= begin
+        if @chef_config[:chef_repo_path]
+          server_path(File.expand_path(@cwd))
+        else
+          nil
+        end
+      end
     end
 
     # Print the given server path, relative to the current directory
@@ -118,14 +124,18 @@ module ChefFS
       server_path
     end
 
+    def require_chef_repo_path
+      if !@chef_config[:chef_repo_path]
+        Chef::Log.error("Must specify either chef_repo_path or cookbook_path in Chef config file")
+        exit(1)
+      end
+    end
+
     private
 
     def object_paths
       @object_paths ||= begin
-        if !@chef_config[:chef_repo_path]
-          Chef::Log.error("Must specify either chef_repo_path or cookbook_path in Chef config file")
-          exit(1)
-        end
+        require_chef_repo_path
 
         result = {}
         case @chef_config[:repo_mode]

data/lib/chef_fs/knife.rb

@@ -94,6 +94,8 @@ module ChefFS
       # Could be super useful in a world with multiple repo paths
       args.map do |arg|
         if !@chef_fs_config.base_path && !ChefFS::PathUtils.is_absolute?(arg)
+          # Check if chef repo path is specified to give a better error message
+          @chef_fs_config.require_chef_repo_path
           ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path")
           exit(1)
         end

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.2.1"
+  VERSION = "1.3"
 end

data/spec/integration/redirection_spec.rb

@@ -16,6 +16,7 @@ describe 'redirection' do
         app = lambda do |env|
           [302, {'Content-Type' => 'text','Location' => "#{@real_chef_server_url}#{env['PATH_INFO']}" }, ['302 found'] ]
         end
+        Thin::Logging.silent = true
         @redirector_server = Thin::Server.new('127.0.0.1', 9018, app, { :signals => false })
         @redirector_thread = Thread.new do
           begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors: