berkshelf-bzr 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99abd99af539c2d1aab45f98ce47cde5aea182c0
-  data.tar.gz: 8a947c8bf7ed24a0406375c95488e70e26282372
+  metadata.gz: 8df4ee900cfdfca48b8846ab67bb0f4276fd8217
+  data.tar.gz: 77e4f1ab05c61d938403d4eadf2edd95f5623c73
 SHA512:
-  metadata.gz: ca57bab4b4595ee215f61a7f8a5047abc15f9bce72c285b528c398769c7cc19e4175e872d6c12e3b3e899860ac7f9e81a7c7c59963e1546cadda9ad5b1d6c454
-  data.tar.gz: 12e7cd2b79b2ca5ce7df8bc530396b3b4c9e0e5f4fb99949cf0583b7fe06dc633b715ba4a5ede5876f6d91df9e2b070b0eb5370ca19c96a79ea2ff802f0cd680
+  metadata.gz: 5fd1115f955ff0d8541d611fdc6d8db9026e947785e4c6d0e1b694180d3d870ca5db7944aa4a15ac006505f56fb97dab5da4fd75c2c41e5331305f87e49f57d8
+  data.tar.gz: b5481a28137f178a78b52ca1dce8e64c158db0afc919df55a739123755396abcebee7fadd4534b5b1f8133fb1bee2db99f6f75942f810b72a73a2c634b64d113

data/.travis.yml

@@ -1,12 +1,19 @@
+sudo: true
+language: ruby
+cache: bundler
+
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install bzr
   - bzr whoami 'Test <test@test.net>'
 
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+matrix:
+  include:
+    - rvm: 2.2.5
+    - rvm: 2.3.1
+    - rvm: ruby-head
+  allow_failures:
+    - rvm: ruby-head
 
 bundler_args: --jobs 7
 

data/README.md

@@ -1,31 +1,35 @@
-Berkshelf Bzr
-============
-[![Gem Version](https://badge.fury.io/rb/berkshelf-bzr.png)](http://badge.fury.io/rb/berkshelf-bzr)
-[![Build Status](https://travis-ci.org/berkshelf/berkshelf-bzr.png?branch=master)](https://travis-ci.org/berkshelf/berkshelf-bzr)
-[![Code Climate](https://codeclimate.com/github/berkshelf/berkshelf-bzr.png)](https://codeclimate.com/github/berkshelf/berkshelf-bzr)
+# Berkshelf Bzr
+
+[![Gem Version](https://badge.fury.io/rb/berkshelf-bzr.svg)](http://badge.fury.io/rb/berkshelf-bzr) [![Build Status](https://travis-ci.org/berkshelf/berkshelf-bzr.svg?branch=master)](https://travis-ci.org/berkshelf/berkshelf-bzr) [![Code Climate](https://codeclimate.com/github/berkshelf/berkshelf-bzr.svg)](https://codeclimate.com/github/berkshelf/berkshelf-bzr)
 
 Berkshelf Bzr is a Berkshelf extension that adds support for downloading cookbooks from Bazaar locations.
 
-Installation
-------------
+## Installation
+
 Add this line to your application's Gemfile:
 
-    gem 'berkshelf-bzr'
+```
+gem 'berkshelf-bzr'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install berkshelf-bzr
+```
+$ gem install berkshelf-bzr
+```
+
+## Usage
 
-Usage
------
 Activate the extension in your `Berksfile`:
 
 ```ruby
-source 'https://api.berkshelf.com'
+source 'https://supermarket.chef.io'
 extension 'bzr'
 ```
 
@@ -41,10 +45,9 @@ You may also specify a `ref` (see output of bzr help revisionspec):
 cookbook 'mycookbook', bzr: 'lp:mycookbook', ref: 'revno:7'
 ```
 
-License & Authors
------------------
-The code is an adaptation of Mercurial berkshelf's extension
-(https://github.com/berkshelf/berkshelf-hg)
+## License & Authors
+
+The code is an adaptation of Mercurial berkshelf's extension (<https://github.com/berkshelf/berkshelf-hg>)
 
 - Author: David Chauviere (d_chauviere@yahoo.fr)
 

data/berkshelf-bzr.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version     = '>= 2.2.0'
   # Runtime dependencies
-  spec.add_dependency 'berkshelf', '~> 3.1'
+  spec.add_dependency 'berkshelf', '~> 4.0'
 
   # Development dependencies
   spec.add_development_dependency 'aruba', '~> 0.5'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake', '~> 0.9'
+  spec.add_development_dependency 'rake'
 end

data/lib/berkshelf/bzr/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Bzr
-    VERSION = '0.4.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/berkshelf/locations/bzr.rb

@@ -53,7 +53,7 @@ module Berkshelf
     #
     # @see BaseLocation#install
     def install
-      if cached?
+      if cached? && valid?
         Dir.chdir(cache_path) do
           bzr %|pull|
         end
@@ -146,6 +146,37 @@ module Berkshelf
       end
     end
 
+    # Retrieve repository branch name or parent branch from a info output
+    #
+    # @return [string]
+    def retrieve_branch(output)
+      result = output.match(/repository branch: (.*)/)
+      return result.captures if result != nil
+      result = output.match(/parent branch: (.*)/)
+      return result.captures if result != nil
+      ''
+    end
+
+    # Determine if a bazaar cached location is valid
+    # Needed when we use alias in Berksfile
+    #
+    # @return [Boolean]
+    def valid?
+      # Get information
+      stdout_cached=''
+      Dir.chdir(cache_path) do
+        stdout_cached = retrieve_branch(bzr %|info|)
+      end
+      stdout_new = retrieve_branch(bzr %|info #{uri}|)
+      # Check if alias has been moved to a new release
+      if stdout_cached != stdout_new then
+        FileUtils.rm_rf cache_path
+        false
+      else
+        true
+      end
+    end
+
     # Determine if this bazaar repo has already been downloaded.
     #
     # @return [Boolean]

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'berkshelf/bzr'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/unit/locations/bzr_spec.rb

@@ -5,7 +5,7 @@ module Berkshelf
     let(:dependency) { double(name: 'bacon') }
 
     subject do
-      described_class.new(dependency, bzr: 'https://repo.com', 
+      described_class.new(dependency, bzr: 'https://repo.com',
                           ref: 'revno:2', revision: 'revid:test@test.net-20140320213448-r0103d8bgjlu5jyz')
     end
 
@@ -31,36 +31,37 @@ module Berkshelf
 
     describe '#installed?' do
       it 'returns false when there is no revision' do
-        subject.stub(:revision).and_return(nil)
-        expect(subject.installed?).to be_false
+        allow(subject).to receive(:revision).and_return(nil)
+        expect(subject.installed?).to be_falsey
       end
       it 'returns false when the install_path does not exist' do
-        subject.stub(:revision).and_return('abcd1234')
-        subject.stub(:install_path).and_return(double(exist?: false))
-        expect(subject.installed?).to be_false
+        allow(subject).to receive(:revision).and_return('abcd1234')
+        allow(subject).to receive(:install_path).and_return(double(exist?: false))
+        expect(subject.installed?).to be false
       end
 
       it 'returns true when the location is installed' do
-        subject.stub(:revision).and_return('abcd1234')
-        subject.stub(:install_path).and_return(double(exist?: true))
-        expect(subject.installed?).to be_true
+        allow(subject).to receive(:revision).and_return('abcd1234')
+        allow(subject).to receive(:install_path).and_return(double(exist?: true))
+        expect(subject.installed?).to be true
       end
     end
 
     describe '#install' do
       before do
-        CachedCookbook.stub(:from_store_path)
-        FileUtils.stub(:cp_r)
-        File.stub(:chmod)
-        subject.stub(:validate_cached!)
-        subject.stub(:validate_cookbook!)
-        subject.stub(:bzr)
+        allow(CachedCookbook).to receive(:from_store_path)
+        allow(FileUtils).to receive(:cp_r)
+        allow(File).to receive(:chmod)
+        allow(subject).to receive(:validate_cached!)
+        allow(subject).to receive(:validate_cookbook!)
+        allow(subject).to receive(:bzr)
       end
 
       context 'when the repository is cached' do
         it 'pulls a new version' do
-          Dir.stub(:chdir).and_yield
-          subject.stub(:cached?).and_return(true)
+          allow(Dir).to receive(:chdir).and_yield
+          allow(subject).to receive(:cached?).and_return(true)
+          allow(subject).to receive(:valid?).and_return(true)
           expect(subject).to receive(:bzr).with('pull')
           subject.install
         end
@@ -68,9 +69,9 @@ module Berkshelf
 
       context 'when the revision is not cached' do
         it 'clones the repository' do
-          Dir.stub(:chdir).and_yield
-          subject.stub(:cached?).and_return(false)
-          FileUtils.stub(:mkdir_p)
+          allow(Dir).to receive(:chdir).and_yield
+          allow(subject).to receive(:cached?).and_return(false)
+          allow(FileUtils).to receive(:mkdir_p)
           expect(subject).to receive(:bzr).with(/branch https:\/\/repo.com .*/)
           subject.install
         end
@@ -79,13 +80,13 @@ module Berkshelf
 
     describe '#cached_cookbook' do
       it 'returns nil if the cookbook is not installed' do
-        subject.stub(:installed?).and_return(false)
+        allow(subject).to receive(:installed?).and_return(false)
         expect(subject.cached_cookbook).to be_nil
       end
 
       it 'returns the cookbook at the install_path' do
-        subject.stub(:installed?).and_return(true)
-        CachedCookbook.stub(:from_path)
+        allow(subject).to receive(:installed?).and_return(true)
+        allow(CachedCookbook).to receive(:from_path)
 
         expect(CachedCookbook).to receive(:from_path).once
         subject.cached_cookbook
@@ -100,17 +101,17 @@ module Berkshelf
       end
 
       it 'returns false when the other location is not an BzrLocation' do
-        other.stub(:is_a?).and_return(false)
+        allow(other).to receive(:is_a?).and_return(false)
         expect(subject).to_not eq(other)
       end
 
       it 'returns false when the uri is different' do
-        other.stub(:uri).and_return('different')
+        allow(other).to receive(:uri).and_return('different')
         expect(subject).to_not eq(other)
       end
 
       it 'returns false when the ref is different' do
-        other.stub(:ref).and_return('different')
+        allow(other).to receive(:ref).and_return('different')
         expect(subject).to_not eq(other)
       end
     end
@@ -135,14 +136,14 @@ module Berkshelf
       before { described_class.send(:public, :bzr) }
 
       it 'raises an error if Bazaar is not installed' do
-        Berkshelf.stub(:which).and_return(false)
+        allow(Berkshelf).to receive(:which).and_return(false)
         expect { subject.bzr('foo') }.to raise_error(BzrLocation::BzrNotInstalled)
       end
 
       it 'raises an error if the command fails' do
-
+        allow(Berkshelf).to receive(:which).and_return(true)
         shell_out = double('shell_out', success?: false, stdout: 'bzr: ERROR: Not a branch: "foo".', stderr: nil)
-        Buff::ShellOut.stub(:shell_out).and_return(shell_out)
+        allow(Buff::ShellOut).to receive(:shell_out).and_return(shell_out)
         expect { subject.bzr('foo') }.to raise_error(BzrLocation::BzrCommandError)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-bzr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Chauviere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 description: A Berkshelf plugin that adds support for downloading Chef cookbooks from
   Bazaar locations.
 email:
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Bazaar support for Berkshelf