knife-essentials 0.8.4 → 0.8.5

data/spec/integration/diff_spec.rb

@@ -97,7 +97,15 @@ EOM
 EOM
 
       it 'knife diff reports no differences' do
-        knife('diff /').should_succeed :stdout => ''
+        knife('diff /').should_succeed ''
+      end
+
+      it 'knife diff /environments/nonexistent.json reports an error' do
+        knife('diff /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory on remote or local\n"
+      end
+
+      it 'knife diff /environments/*.txt reports an error' do
+        knife('diff /environments/*.txt').should_fail "ERROR: /environments/*.txt: No such file or directory on remote or local\n"
       end
 
       context 'except the role file' do
@@ -134,6 +142,22 @@ A\t/environments/y.json
 A\t/roles/y.json
 EOM
         end
+
+        context 'when cwd is the data_bags directory' do
+          cwd 'data_bags'
+          it 'knife diff reports different data bags' do
+            knife('diff --name-status').should_succeed <<EOM
+A\tx/z.json
+A\ty
+EOM
+          end
+          it 'knife diff * reports different data bags' do
+            knife('diff --name-status *').should_succeed <<EOM
+A\tx/z.json
+A\ty
+EOM
+          end
+        end
       end
     end
 
@@ -144,6 +168,56 @@ D\t/cookbooks
 D\t/data_bags
 D\t/environments
 D\t/roles
+EOM
+      end
+    end
+  end
+
+  when_the_repository 'has a cookbook' do
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'cookbooks/x/onlyin1.0.0.rb', ''
+
+    when_the_chef_server 'has a later version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => '' }
+
+      it 'knife diff /cookbooks/x shows differences' do
+        knife('diff --name-status /cookbooks/x').should_succeed <<EOM
+M\t/cookbooks/x/metadata.rb
+D\t/cookbooks/x/onlyin1.0.1.rb
+A\t/cookbooks/x/onlyin1.0.0.rb
+EOM
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => '' }
+      it 'knife diff /cookbooks/x shows no differences' do
+        knife('diff --name-status /cookbooks/x').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has a later version for the cookbook, and no current version' do
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => '' }
+
+      it 'knife diff /cookbooks/x shows the differences' do
+        knife('diff --name-status /cookbooks/x').should_succeed <<EOM
+M\t/cookbooks/x/metadata.rb
+D\t/cookbooks/x/onlyin1.0.1.rb
+A\t/cookbooks/x/onlyin1.0.0.rb
+EOM
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => '' }
+
+      it 'knife diff /cookbooks/x shows the differences' do
+        knife('diff --name-status /cookbooks/x').should_succeed <<EOM
+M\t/cookbooks/x/metadata.rb
+D\t/cookbooks/x/onlyin0.9.9.rb
+A\t/cookbooks/x/onlyin1.0.0.rb
 EOM
       end
     end

data/spec/integration/download_spec.rb

@@ -134,6 +134,30 @@ EOM
         end
       end
 
+      context 'except the role file is textually different, but not ACTUALLY different' do
+        file 'roles/x.json', <<EOM
+{
+  "chef_type": "role",
+  "default_attributes": {
+  },
+  "env_run_lists": {
+  },
+  "json_class": "Chef::Role",
+  "name": "x",
+  "description": "",
+  "override_attributes": {
+  },
+  "run_list": [
+
+  ]
+}
+EOM
+        it 'knife download / does not change anything' do
+          knife('download /').should_succeed ''
+          knife('diff --name-status /').should_succeed ''
+        end
+      end
+
       context 'as well as one extra copy of each thing' do
         file 'clients/y.json', { 'name' => 'y' }
         file 'cookbooks/x/blah.rb', ''
@@ -337,6 +361,28 @@ Deleted extra entry /data_bags/x/deleted.json (purge is on)
 EOM
         knife('diff --name-status /data_bags').should_succeed ''
       end
+      context 'when cwd is the /data_bags directory' do
+        cwd 'data_bags'
+        it 'knife download fails' do
+          knife('download').should_fail "FATAL: Must specify at least one argument.  If you want to download everything in this directory, type \"knife download .\"\n", :stdout => /USAGE/
+        end
+        it 'knife download --purge . downloads everything' do
+          knife('download --purge .').should_succeed <<EOM
+Created x/added.json
+Updated x/modified.json
+Deleted extra entry x/deleted.json (purge is on)
+EOM
+          knife('diff --name-status /data_bags').should_succeed ''
+        end
+        it 'knife download --purge * downloads everything' do
+          knife('download --purge *').should_succeed <<EOM
+Created x/added.json
+Updated x/modified.json
+Deleted extra entry x/deleted.json (purge is on)
+EOM
+          knife('diff --name-status /data_bags').should_succeed ''
+        end
+      end
     end
   end
 
@@ -396,8 +442,59 @@ EOM
     end
   end
 
-  # download from a cwd
-  # download with *'s
-  # download with JSON that isn't *really* modified
-  # Multiple cookbook versions!!!
+  when_the_repository 'has a cookbook' do
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
+
+    when_the_chef_server 'has a later version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+
+      it 'knife download /cookbooks/x downloads the latest version' do
+        knife('download --purge /cookbooks/x').should_succeed <<EOM
+Updated /cookbooks/x/metadata.rb
+Created /cookbooks/x/onlyin1.0.1.rb
+Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+EOM
+        knife('diff --name-status /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook' do
+      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+      it 'knife download /cookbooks/x downloads the updated file' do
+        knife('download --purge /cookbooks/x').should_succeed <<EOM
+Updated /cookbooks/x/onlyin1.0.0.rb
+EOM
+        knife('diff --name-status /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has a later version for the cookbook, and no current version' do
+      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+
+      it 'knife download /cookbooks/x downloads the latest version' do
+        knife('download --purge /cookbooks/x').should_succeed <<EOM
+Updated /cookbooks/x/metadata.rb
+Created /cookbooks/x/onlyin1.0.1.rb
+Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+EOM
+        knife('diff --name-status /cookbooks').should_succeed ''
+      end
+    end
+
+    when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
+      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+
+      it 'knife download /cookbooks/x downloads the old version' do
+        knife('download --purge /cookbooks/x').should_succeed <<EOM
+Updated /cookbooks/x/metadata.rb
+Created /cookbooks/x/onlyin0.9.9.rb
+Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+EOM
+        knife('diff --name-status /cookbooks').should_succeed ''
+      end
+    end
+  end
 end

data/spec/integration/raw_spec.rb

@@ -0,0 +1,171 @@
+require 'support/integration_helper'
+require 'chef/knife/raw_essentials'
+require 'chef/knife/show_essentials'
+
+describe 'knife raw' do
+  extend IntegrationSupport
+  include KnifeSupport
+
+  when_the_chef_server "has one of each thing" do
+    client 'x', '{}'
+    cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
+    data_bag 'x', { 'y' => '{}' }
+    environment 'x', '{}'
+    node 'x', '{}'
+    role 'x', '{}'
+    user 'x', '{}'
+
+    it 'knife raw /nodes/x returns the node', :pending => (RUBY_VERSION < "1.9") do
+      knife('raw /nodes/x').should_succeed <<EOM
+{
+  "name": "x",
+  "json_class": "Chef::Node",
+  "chef_type": "node",
+  "chef_environment": "_default",
+  "override": {
+  },
+  "normal": {
+  },
+  "default": {
+  },
+  "automatic": {
+  },
+  "run_list": [
+
+  ]
+}
+EOM
+    end
+
+    it 'knife raw /blarghle returns 404' do
+      knife('raw /blarghle').should_fail(/ERROR: Server responded with error 404 "Not Found"/)
+    end
+
+    it 'knife raw -m DELETE /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+      knife('raw -m DELETE /roles/x').should_succeed <<EOM
+{
+  "name": "x",
+  "description": "",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+      knife('show /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
+    end
+
+    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+      Tempfile.open('raw_put_input') do |file|
+        file.write <<EOM
+{
+  "name": "x",
+  "description": "eek",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+        file.close
+
+        knife("raw -m PUT -i #{file.path} /roles/x").should_succeed <<EOM
+{
+  "name": "x",
+  "description": "eek",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+        knife('show /roles/x.json').should_succeed <<EOM
+/roles/x.json:
+{
+  "name": "x",
+  "description": "eek",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "chef_type": "role",
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+      end
+    end
+
+    it 'knife raw -m POST -i blah.txt /roles succeeds', :pending => (RUBY_VERSION < "1.9") do
+      Tempfile.open('raw_put_input') do |file|
+        file.write <<EOM
+{
+  "name": "y",
+  "description": "eek",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+        file.close
+
+        knife("raw -m POST -i #{file.path} /roles").should_succeed <<EOM
+{
+  "uri": "#{ChefZero::RSpec.server.url}/roles/y"
+}
+EOM
+        knife('show /roles/y.json').should_succeed <<EOM
+/roles/y.json:
+{
+  "name": "y",
+  "description": "eek",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "chef_type": "role",
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+      end
+    end
+  end
+end

data/spec/integration/show_spec.rb

@@ -0,0 +1,124 @@
+require 'support/integration_helper'
+require 'chef/knife/show_essentials'
+
+describe 'knife show' do
+  extend IntegrationSupport
+  include KnifeSupport
+
+  when_the_chef_server "has one of each thing" do
+    client 'x', '{}'
+    cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
+    data_bag 'x', { 'y' => '{}' }
+    environment 'x', '{}'
+    node 'x', '{}'
+    role 'x', '{}'
+    user 'x', '{}'
+
+    when_the_repository 'also has one of each thing' do
+      file 'clients/x.json', { 'foo' => 'bar' }
+      file 'cookbooks/x/metadata.rb', 'version "1.0.1"'
+      file 'data_bags/x/y.json', { 'foo' => 'bar' }
+      file 'environments/_default.json', { 'foo' => 'bar' }
+      file 'environments/x.json', { 'foo' => 'bar' }
+      file 'nodes/x.json', { 'foo' => 'bar' }
+      file 'roles/x.json', { 'foo' => 'bar' }
+      file 'users/x.json', { 'foo' => 'bar' }
+
+      it 'knife show /cookbooks/x/metadata.rb shows the remote version' do
+        knife('show /cookbooks/x/metadata.rb').should_succeed <<EOM
+/cookbooks/x/metadata.rb:
+version "1.0.0"
+EOM
+      end
+      it 'knife show --local /cookbooks/x/metadata.rb shows the local version' do
+        knife('show --local /cookbooks/x/metadata.rb').should_succeed <<EOM
+/cookbooks/x/metadata.rb:
+version "1.0.1"
+EOM
+      end
+      it 'knife show /data_bags/x/y.json shows the remote version' do
+        knife('show /data_bags/x/y.json').should_succeed <<EOM
+/data_bags/x/y.json:
+{
+  "id": "y"
+}
+EOM
+      end
+      it 'knife show --local /data_bags/x/y.json shows the local version' do
+        knife('show --local /data_bags/x/y.json').should_succeed <<EOM
+/data_bags/x/y.json:
+{
+  "foo": "bar"
+}
+EOM
+      end
+      it 'knife show /environments/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+        knife('show /environments/x.json').should_succeed <<EOM
+/environments/x.json:
+{
+  "name": "x",
+  "description": "",
+  "cookbook_versions": {
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  }
+}
+EOM
+      end
+      it 'knife show --local /environments/x.json shows the local version' do
+        knife('show --local /environments/x.json').should_succeed <<EOM
+/environments/x.json:
+{
+  "foo": "bar"
+}
+EOM
+      end
+      it 'knife show /roles/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+        knife('show /roles/x.json').should_succeed <<EOM
+/roles/x.json:
+{
+  "name": "x",
+  "description": "",
+  "json_class": "Chef::Role",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "chef_type": "role",
+  "run_list": [
+
+  ],
+  "env_run_lists": {
+  }
+}
+EOM
+      end
+      it 'knife show --local /roles/x.json shows the local version' do
+        knife('show --local /roles/x.json').should_succeed <<EOM
+/roles/x.json:
+{
+  "foo": "bar"
+}
+EOM
+      end
+      # show directory
+      it 'knife show /data_bags/x fails' do
+        knife('show /data_bags/x').should_fail "ERROR: /data_bags/x: is a directory\n"
+      end
+      it 'knife show --local /data_bags/x fails' do
+        knife('show --local /data_bags/x').should_fail "ERROR: /data_bags/x: is a directory\n"
+      end
+      # show nonexistent file
+      it 'knife show /environments/nonexistent.json fails' do
+        knife('show /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+      end
+      it 'knife show --local /environments/nonexistent.json fails' do
+        knife('show --local /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+      end
+    end
+  end
+end