knife-ec-backup 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdece34d78c5071fd6f144f35ca43b19d03ba1d6
-  data.tar.gz: b99f92444ffc7a236c0dd7573105a4cd048f995d
+  metadata.gz: a187d7821b4df5f920077d6296c577072aa75bce
+  data.tar.gz: f4390e3df7e068abf0ef5006e635af57d3d00d68
 SHA512:
-  metadata.gz: 979c5e7cd188d37a1e9a124f60cbf3dc7aaa2b9919c44ab646969cb3c4a517fbb7bcc190e052d9df580c7561b6930c6d898449e2477576bca2ab99afb0675364
-  data.tar.gz: 8f9f705300333b9a42fe6e18c6fa64b6ae2b51f7bfa998988c5e9ca8a69e6a6364998238688744c0c664350c7bbcf5ed97c64118098f4539e668606a2fa3a601
+  metadata.gz: 4e084402900350853c0fd70e83727c69d5c7dd8d13bc9a823d8582a8c957f999a4d94b1b73cba0730a22b65d598f440e09e95c0c37f230f6dc01013c3559a1ee
+  data.tar.gz: 6c5f16496c066d2004216bdaaa644a7b4dfaa7eaebd5208aff91f095b3c85893372ce3df20131f2e09f489e087ceba551984b7c41a85a466d2c411fda0ac45c6

data/README.md

@@ -31,9 +31,19 @@ the key data.
 # Installation
 
 ## Chef Server Install (Recommended)
-This will install the plugin directly on the Chef Server:
 
-    /opt/opscode/embedded/bin/gem install knife-ec-backup
+This gem is installed with chef-server-core 12.0.0 and newer. 
+
+For Private Chef 11 (or Enterprise Chef 11) you'll need to download and build
+locally to get the correct dependencies, either with `git clone` or by
+downloading the .zip file. Once unpacked, run:
+
+```
+/opt/opscode/embedded/bin/gem build knife-ec-backup.gemspec
+/opt/opscode/embedded/bin/gem install knife-ec-backup*gem --no-ri --no-rdoc -V
+```
+
+### Note on installing with existing development tools:
 
 The latest versions of knife-ec-backup require gems with native
 extensions, thus you must install a standard build toolchain.  To
@@ -43,10 +53,11 @@ on your system, try the following:
    /opt/opscode/embedded/bin/gem install knife-ec-backup -- --with-pg-config=/opt/opscode/embedded/postgresql/9.2/bin/pg_config
 
 ## Build from source
+
 Clone the git repository and run the following from inside:
 
     gem build knife-ec-backup.gemspec
-    gem install knife-ec-backup-1.1.3.gem
+    gem install knife-ec-backup*gem
 
 # Configuration
 
@@ -78,6 +89,8 @@ The following options are supported across all subcommands:
 
 ## knife ec backup DEST_DIR (options)
 
+*Path*: If you have chef-client installed as well, you may need to invoke this as `/opt/opscode/embedded/bin/knife ec backup backup`
+
 *Options*
 
   * `--concurrency THREAD_COUNT`:

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -52,62 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '11.8'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Backup and Restore of Enterprise Chef
 email: jkeiser@opscode.com
 executables: []
@@ -126,7 +70,6 @@ files:
 - lib/chef/knife/ec_key_import.rb
 - lib/chef/knife/ec_restore.rb
 - lib/chef/org_id_cache.rb
-- lib/chef/org_id_cache.rb~
 - lib/chef/server.rb
 - lib/chef/tsorter.rb
 - lib/knife_ec_backup/version.rb

data/lib/chef/org_id_cache.rb~

@@ -1,45 +0,0 @@
-#
-# Author:: Steven Danna (<steve@chef.io>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class OrgIdCache
-  class NoSuchOrg < RuntimeError; end
-
-  attr_accesor :db, :cache
-  def initialize(db)
-    @db = db
-    @cache = {}
-  end
-
-  def fetch(org_name)
-    if cache.key?(org_name)
-      cache[org_name]
-    else
-      r = db.get(:id).from(:orgs).where(:org_name => org_name)
-      if r.nil?
-        raise NoSuchOrg
-      else
-        store(org_name, r[:id])
-        r[:id]
-      end
-    end
-  end
-
-  def store(org_name, org_guid)
-    cache[org_name] = org_guid
-  end
-end