knife-tar 1.3.1 → 2.0.0

data/README.md

@@ -1,12 +1,31 @@
 knife-tar
 =========
 
-Description
------------
-
 A knife plugin facilitating uploading chef components from a tar.gz file/url to your 
 chef server as well as downloading components from chef-server to tar.gz format.
 
+View the [Change Log](CHANGELOG.md) to see what has changed.
+
+Installation
+------------
+
+Install the chef gem prior to installing knife-tar.
+
+    gem install knife-tar
+
+Requirements
+------------
+
+* Chef >= 11
+* `tar` is installed and on your `$PATH`
+
+Branches
+--------
+
+ * 1.X - Supports Chef 10
+ * 2.X - Supports Chef 11
+   * Lost support for API Clients
+
 Why?
 ----
 
@@ -28,19 +47,6 @@ realized we could support all of the chef components and modeled the format afte
 [chef-repo](https://github.com/opscode/chef-repo). From there we included the download 
 functionality and supported multiple versions of the same cookbook.
 
-Installation
-------------
-
-Install the chef gem prior to installing knife-tar.
-
-    gem install knife-tar
-
-Requirements
-------------
-
-* Chef >= 0.10.10 (Does not work with Chef 11)
-* `tar` is installed and on your `$PATH`
-
 Conventions
 -----------
 
@@ -63,9 +69,7 @@ We assume that the tar file will look like,
 |- roles  
 | |- \[roleName\].\[json|js|rb\]  
 |- web_users  
-| |- \[webUserName\].\[json|js|rb\]  
-|- api_clients  
-| | - \[clientName\].\[json|js|rb\]  
+| |- \[webUserName\].\[json|js|rb\]   
 |- nodes  
 | |- \[nodeName\].\[json|js|rb\]  
 
@@ -83,9 +87,7 @@ OR
 | |- roles  
 | | |- \[roleName\].\[json|js|rb\]  
 | |- web_users  
-| | |- \[webUserName\].\[json|js|rb\]  
-| |- api_clients  
-| | | - \[clientName\].\[json|js|rb\]  
+| | |- \[webUserName\].\[json|js|rb\]   
 | |- nodes  
 | | |- \[nodeName\].\[json|js|rb\]  
 
@@ -175,24 +177,13 @@ following command,
 
 Command: 'knife node tar upload tarPath (options)'
 
-#### Web UI Users
+#### Users
 
 If you want to upload only your users from your tar file you can use the
 following command,
 
 Command: 'knife user tar upload tarPath (options)'
 
-
-#### API Clients
-
-**NOTE**: This command requires that you either be running on the chef-server or
-have configured 'couchdb_url' in your knife.rb to work properly.
-
-If you want to upload only your clients from your tar file you can use the
-following command,
-
-Command: 'knife client tar upload tarPath (options)'
-
 ### Downloading
 
 #### Everything
@@ -237,14 +228,7 @@ can use the following command,
 
 Command: 'knife role tar download tarPath (options)'
 
-#### Api Clients
-
-If you want to download all your api clients from chef-server to a tar file you
-can use the following command,
-
-Command: 'knife client tar download tarPath (options)'
-
-#### Web UI Users
+#### Users
 
 If you want to download all your web ui users from chef-server to a tar file you
 can use the following command,

data/Rakefile

@@ -1,189 +1,61 @@
 # coding: UTF-8
-require 'octokit'
-
-REPO = "cerner/knife-tar"
 
 task :default => [:build]
 
 task :build  do
-  build_gem
+  puts "Building the gem"
+  runCommand "gem build knife-tar.gemspec"
 end
 
-task :build_change_log do
-  closed_milestones = Octokit.milestones REPO, {:state => "closed"}
-  
-  version_to_milestone = Hash.new
-  versions = Array.new
-  
-  closed_milestones.each do |milestone|
-    version = Gem::Version.new(milestone.title)
-    version_to_milestone.store version, milestone
-    versions.push version
-  end
-  
-  versions = versions.sort.reverse
-  
-  change_log = File.open('CHANGELOG.md', 'w')
-  
+task :release => [:build] do
+  deployGem
+  release
+end
+
+def deployGem
   begin
-    change_log.write "Change Log\n"
-    change_log.write "==========\n"
-    change_log.write "\n"
-    
-    versions.each do |version|
-      milestone = version_to_milestone[version]
-      change_log.write generate_milestone_markdown(milestone)
-      change_log.write "\n"
-    end
+    puts "Pushing the gem to rubygems.org"
+    runCommand "gem push knife-tar*.gem"
   ensure
-    change_log.close
+    system "rm -f knife-tar*.gem"
   end
 end
 
-task :release do
-  
-  # Get current version
-  version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')).chomp
-  
-  # Update change log
-  puts "Updating change log ..."
-  update_change_log version
-  puts "Change log updated!"
-  
-  
-  # Publish the gem
-  deploy
+def release
+ 
+  rawVersion = `cat VERSION`.chomp
  
-  # Tag the release
-  puts "Tagging the #{version} release ..."
-  run_command "git tag -a #{version} -m 'Released #{version}'"
-  run_command "git push origin #{version}"
-  puts "Release tagged!"
+  #Tag the release
+  puts "Tagging the release"
+  runCommand "git tag -a #{rawVersion} -m 'Released #{rawVersion}'"
+  runCommand "git push origin #{rawVersion}"
   
-  # Bump VERSION file
-  versions = version.split "."
+  # Update bump VERSION file
+  versions = rawVersion.split "."
   versions[1] = versions[1].to_i + 1
+  newVersion = versions.join "."
   
-  # Reset bug number if available
-  if versions.size == 3
-    versions[2] = 0
-  end
+  puts "Changing version from #{rawVersion} to #{newVersion}"
   
-  new_version = versions.join "."
+  runCommand "echo '#{newVersion}' > VERSION"
   
-  puts "Updating version from #{version} to #{new_version} ..."
-  File.open('VERSION', 'w') { |file| file.write(new_version) }
-  puts "Version updated!"
+  #Commit the updated VERSION file
+  puts "Commiting the new VERSION file"
+  runCommand "git add VERSION"
+  runCommand "git commit -m 'Released #{rawVersion} and bumped version to #{newVersion}'"
+  runCommand "git push origin master"
   
-  # Commit the updated VERSION file
-  puts "Commiting the new version ..."
-  run_command "git add VERSION"
-  run_command "git commit -m 'Released #{version} and bumped version to #{new_version}'"
-  run_command "git push origin HEAD"
-  puts "Version commited!"
-end
-
-def build_gem
-  puts "Building the gem ..."
-  run_command "gem build knife-tar.gemspec"
-  puts "Gem built!"
-end
-
-def deploy
-  begin
-    build_gem
-    
-    puts "Publishing the gem ..."
-    run_command "gem push knife-tar*.gem"
-    puts "Gem published!"
-  ensure
-    system "rm -f knife-tar*.gem"
-  end
 end
 
-def update_change_log version
-  change_log_lines = IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).split("\n")
-  
-  change_log = File.open('CHANGELOG.md', 'w')
-  
-  begin
-    
-    # Keep change log title
-    change_log.write change_log_lines.shift
-    change_log.write "\n"
-    change_log.write change_log_lines.shift
-    change_log.write "\n"
-    change_log.write "\n"
+def runCommand command
+  output = system command
+  unless output
+    # Removes changes to tracked files
+    system "git reset --hard"
     
-    # Write new milestone info
-    change_log.write generate_milestone_markdown(milestone(version))
+    # Removes any new un-tracked files
+    system "git clean -f -d"
     
-    # Add previous change log info
-    change_log_lines.each do |line|
-      change_log.write line
-      change_log.write "\n"
-    end
-    
-  ensure
-    change_log.close
-  end
-  
-  run_command "git add CHANGELOG.md"
-  run_command "git commit -m 'Added #{version} to change log'"
-  run_command "git push origin HEAD"
-end
-
-def generate_milestone_markdown milestone
-  strings = Array.new
-  
-  title = "[#{milestone.title}](https://github.com/#{REPO}/issues?milestone=#{milestone.number}&state=closed)"
-  
-  strings.push "#{title}"
-  strings.push "-" * title.length
-  strings.push ""
-  
-  issues = Octokit.issues REPO, {:milestone => milestone.number, :state => "closed"}
-  
-  issues.each do |issue|
-    strings.push "  * [#{issue_type issue}] [Issue-#{issue.number}](https://github.com/#{REPO}/issues/#{issue.number}) : #{issue.title}"
-  end
-  
-  strings.push ""
-  
-  strings.join "\n"
-end
-
-def milestone version
-  closedMilestones = Octokit.milestones REPO, {:state => "closed"}
-  
-  closedMilestones.each do |milestone|
-    if milestone["title"] == version
-      return milestone
-    end
-  end
-  
-  openMilestones = Octokit.milestones REPO
-  
-  openMilestones.each do |milestone|
-    if milestone["title"] == version
-      return milestone
-    end
-  end
-  
-  raise "Unable to find milestone with title [#{version}]"
-end
-
-def issue_type issue
-  labels = Array.new
-  issue.labels.each do |label|
-    labels.push label.name.capitalize
-  end
-  labels.join "/"
-end
-
-def run_command command
-  output = `#{command}`
-  unless $?.success?
-    raise "Command : [#{command}] failed.\nOutput : \n#{output}"
+    raise "Command : #{command} failed"
   end
 end

data/lib/chef/knife/cookbook_tar_upload.rb

@@ -1,5 +1,6 @@
 require 'chef/knife'
 require 'chef/cookbook/metadata'
+require 'chef/cookbook_loader'
 require 'chef/cookbook_uploader'
 require 'chef/tar_file'
 require 'tmp_directory'

data/lib/chef/knife/tar_download_all.rb

@@ -19,7 +19,6 @@ class Chef
         
         tar_file = Chef::TarFile.new(@name_args.first, true)
         
-        ClientTarDownload.download_clients tar_file
         CookbookTarDownload.download_cookbooks tar_file
         DataBagTarDownload.download_data_bags tar_file
         EnvironmentTarDownload.download_environments tar_file

data/lib/chef/knife/tar_upload_all.rb

@@ -21,12 +21,6 @@ class Chef
         
         # Attempt to upload all the components in the tar file
         # If our tar file does not contain a component ignore the error and skip it
-        begin
-          ClientTarUpload.upload_clients tar_file
-        rescue TarFile::MissingChefComponentError => e
-          ui.info("No Client files to upload")
-        end
-        
         begin
           CookbookTarUpload.upload_cookbooks tar_file
         rescue TarFile::MissingChefComponentError => e

data/lib/chef/knife/user_tar_download.rb

@@ -1,7 +1,7 @@
 require 'chef/knife'
 require 'chef/knife/core/object_loader'
 require 'chef/json_compat'
-require 'chef/webui_user'
+require 'chef/user'
 
 class Chef
   class Knife
@@ -26,9 +26,9 @@ class Chef
       
       def self.download_users(tar_file)
         dir = tar_file.web_users_path
-        Chef::WebUIUser.list.each do |component_name, url|
+        Chef::User.list.each do |component_name, url|
           Chef::Log.info("Backing up user #{component_name}")
-          component_obj = Chef::WebUIUser.load(component_name)
+          component_obj = Chef::User.load(component_name)
           File.open(File.join(dir, "#{component_name}.json"), "w") do |component_file|
             component_file.print(component_obj.to_json)
           end

data/lib/chef/knife/user_tar_upload.rb

@@ -1,7 +1,8 @@
 require 'chef/knife'
 require 'chef/knife/core/object_loader'
 require 'chef/json_compat'
-require 'chef/webui_user'
+require 'chef/user'
+require 'yajl'
 
 class Chef
   class Knife
@@ -24,20 +25,23 @@ class Chef
       end
       
       def self.upload_users(tar_file)
-        current_users = Chef::WebUIUser.list.keys
-        users_loader = Chef::Knife::Core::ObjectLoader.new(Chef::WebUIUser, ui)
+        current_users = Chef::User.list.keys
+        users_loader = Chef::Knife::Core::ObjectLoader.new(Chef::User, ui)
         
         tar_file.web_users.each do |web_user_path|
           
-          user = users_loader.load_from("users", web_user_path)
+          unless users_loader.find_file("users", web_user_path).nil?
+            user_hash = Yajl::Parser.parse(IO.read(web_user_path))
+          end
+          user = Chef::User.from_hash(user_hash)
           
-           # In order to 'update' a user we have to remove it first, so if the user exists destroy it
+           # Update existing users, otherwise save the new user
           if current_users.include? user.name
-            ui.info("Deleting Chef User [#{user.name}] in order to update it")
-            WebUIUser.load(user.name).destroy
+            user.update
+          else
+            user.save
           end
-          
-          user.save
+ 
           ui.info("Updated User : #{user.name}")
         end
       end

metadata

@@ -1,53 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: knife-tar
-version: !ruby/object:Gem::Version
-  version: 1.3.1
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
-authors:
+authors: 
 - Bryan Baugher
 - Aaron Blythe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-01-16 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.12'
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 11
+        - 0
+        - 0
+        version: 11.0.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.12'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
         version: 0.9.2.2
-description: This is a knife plugin for Chef which can install and upload chef components
-  from a tar file or url
+  type: :development
+  version_requirements: *id003
+description: This is a knife plugin for Chef which can install and upload chef components from a tar file or url
 email: Bryan.Baugher@Cerner.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/chef/knife/client_tar_download.rb
-- lib/chef/knife/client_tar_upload.rb
+
+files: 
 - lib/chef/knife/cookbook_tar_download.rb
 - lib/chef/knife/cookbook_tar_upload.rb
 - lib/chef/knife/data_bag_tar_download.rb
@@ -67,29 +88,35 @@ files:
 - Gemfile
 - Rakefile
 - README.md
+has_rdoc: true
 homepage: http://github.com/Cerner/knife-tar
-licenses:
+licenses: 
 - Apache License, Version 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: nowarning
-rubygems_version: 2.0.3
+
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
-summary: A Chef knife plugin to install/upload chef components from a tar file or
-  url
+specification_version: 3
+summary: A Chef knife plugin to install/upload chef components from a tar file or url
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4e8511e64a86e613d01c98e287f7abb5a2284ab7
-  data.tar.gz: 8cfaaf1f41493c2a32d6b41dbc25598ae54b9610
-SHA512:
-  metadata.gz: e13aa6fc497ba20dbee01b94a03b58fe77c5124fc678c4a4d018b44ba29bee4c434559ba1efde221726ef89ded8ca4348f6bc77f06e1185d3b84eb5abfa98570
-  data.tar.gz: 5d462a08ebb757e0a10afbd1cbd002464f1b1429e0582ebbb6e2750f0e26ab442a02b976c472274434a5de66dd5d8d0af7aaa386ee936bdf714fd89b2d4a65ed

data/lib/chef/knife/client_tar_download.rb

@@ -1,40 +0,0 @@
-require 'chef/knife'
-require 'chef/knife/core/object_loader'
-require 'chef/json_compat'
-require 'chef/api_client'
-
-class Chef
-  class Knife
-    class ClientTarDownload < Chef::Knife
-
-      banner "knife client tar download tarPath [options]"
-      category "client tar"
-
-      def run
-        #Get Arguments
-        if @name_args.size != 1
-          ui.info("Please specify a tar path")
-          show_usage
-          exit 1
-        end
-        
-        tar_file = Chef::TarFile.new(@name_args.first, true)
-        ClientTarDownload.download_clients tar_file
-        tarFile.save
-        
-      end
-      
-      def self.download_clients(tar_file)
-        dir = tar_file.api_clients_path
-        Chef::ApiClient.list.each do |component_name, url|
-          Chef::Log.info("Backing up client #{component_name}")
-          component_obj = Chef::ApiClient.load(component_name)
-          File.open(File.join(dir, "#{component_name}.json"), "w") do |component_file|
-            component_file.print(component_obj.to_json)
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/chef/knife/client_tar_upload.rb

@@ -1,49 +0,0 @@
-require 'chef/knife'
-require 'chef/knife/core/object_loader'
-require 'chef/json_compat'
-
-class Chef
-  class Knife
-    class ClientTarUpload < Chef::Knife
-
-      banner "knife client tar upload tarPath [options]"
-      category "client tar"
-
-      def run
-        #Get Arguments
-        if @name_args.size != 1
-          ui.info("Please specify a tar path")
-          show_usage
-          exit 1
-        end
-        
-        tar_file = Chef::TarFile.new(@name_args.first)
-        ClientTarUpload.upload_clients tar_file
-        
-      end
-      
-      def self.upload_clients(tar_file)
-        ui.confirm "This command will only work when running on chef-server or by updating the couchdb_url in your knife config to point to your couchdb instance. Are you sure you want to continue"
-        
-        client_loader = Chef::Knife::Core::ObjectLoader.new(Chef::ApiClient, ui)
-        current_clients = Chef::ApiClient.list.keys
-        
-        tar_file.api_clients.each do |api_client_path|
-          
-          client = client_loader.load_from("clients", api_client_path)
-          
-          # In order to 'update' a client we have to remove it first, so if the client exists destroy it
-          if current_clients.include? client.name
-            ApiClient.load(client.name).destroy
-          end
-          
-          client.cdb_save
-          
-          ui.info("Updated Client : #{client.name}")
-          
-        end
-      end
-
-    end
-  end
-end