librarianp 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ebdbe74e4883d9dbd1b042307b395f5d62bc69bb0e4a49f002438bcd62cbc2
-  data.tar.gz: a0b41c7ed1dc96c41bbd2a290ff08b7aef31c1de39a12fca3a768861e6951ff9
+  metadata.gz: 03324f329c31fdac36efd22059ab329088982e78574ccbad2b9e94e2b1dbe4bf
+  data.tar.gz: 5cb5ec7c6f01dc7485baa2ea06bc6f153cc266b82b10a9c2ac0d7869d66617b8
 SHA512:
-  metadata.gz: cc33792de21cfa8b351a3098bdfbfb659c08a8aa369e5e29f4a3ddf6ea3384d878293b959294c4fefdae59b59e9c8207a004d9e42a444804f4fb362867a6d515
-  data.tar.gz: 3d21e30a41fe594c6255f80d07595ea07b46e18ec352f8340bffa19d1031c30fd0c4890810e88a5f2cc3ce650c8a9587a2eb15d3a21d5dbe9748f3fb0ee5d002
+  metadata.gz: 15ed4fd64d5185b430162dd31ecaeee2e081f370dd73eeedba1af2cfaa8328147ed15d8f39ca5313030b7508251c5d767d0cd16565ba6606c2771cedd1264995
+  data.tar.gz: eca0a95250556946b61bac1428f862cd7dbd5d102ee1d7ee7ae9536aef2d7c3ae33dec8075d9826b7c26b92d7e3e4dd67488c7b228073628136e9bcc2d70e253

data/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'voxpupuli'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby 3.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+        env:
+          BUNDLE_WITHOUT: release
+      - name: Build gem
+        run: gem build *.gemspec
+      - name: Publish gem to rubygems.org
+        run: gem push *.gem
+        env:
+          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+      - name: Setup GitHub packages access
+        run: |
+          mkdir -p ~/.gem
+          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+      - name: Publish gem to GitHub packages
+        run: gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  - pull_request
+  - push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake spec
+      - name: Verify gem builds
+        run: gem build *.gemspec

data/.gitignore

@@ -3,4 +3,5 @@
 pkg/*
 tmp
 vendor
+.vendor
 Gemfile.lock

data/CHANGELOG.md

@@ -1,4 +1,23 @@
-# Change Log
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [v1.1.2](https://github.com/voxpupuli/librarian/tree/v1.1.2) (2022-08-02)
+
+[Full Changelog](https://github.com/voxpupuli/librarian/compare/v1.1.1...v1.1.2)
+
+**Implemented enhancements:**
+
+- Do not suppress Git console output when debugging [\#20](https://github.com/voxpupuli/librarian/pull/20) ([hlaf](https://github.com/hlaf))
+
+## [v1.1.1](https://github.com/voxpupuli/librarian/tree/v1.1.1) (2021-08-27)
+
+* Fix one more Ruby 3 compatibility issue
+* Search for the Rakefile relatively to pwd
+
+## 1.1.0
+
+* Support Ruby 3
 
 ## 1.0.0
 
@@ -306,3 +325,6 @@ This release focuses on refactoring some of the internals. There are no function
 ## 0.0.1
 
 * Initial release.
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -3,4 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in librarian.gemspec
 gemspec
 
-gem "rubysl", :platforms => %w[rbx]
+group :release, optional: true do
+  gem 'github_changelog_generator', '>= 1.16.4',  :require => false if RUBY_VERSION >= '2.5.0'
+end

data/HISTORY.md

@@ -0,0 +1,315 @@
+## [v1.1.1](https://github.com/voxpupuli/librarian/tree/v1.1.1) (2021-08-27)
+
+* Fix one more Ruby 3 compatibility issue
+* Search for the Rakefile relatively to pwd
+
+## 1.1.0
+
+* Support Ruby 3
+
+## 1.0.0
+
+* Require Ruby 2.4+
+* Update dependencies to the latest versions
+* Be specific about exposing git environment variables
+* Allow more spaces in version range
+
+## 0.6.4
+
+* Add support for r10k Puppetfile's opts
+* Fix deprecation warnings
+* Fix compatibility with git 2.14.0
+
+## 0.6.3
+
+* Prevent losing specfile path when metadata doesn't exist
+
+## 0.6.2
+
+* Fix bad variable name
+
+## 0.6.1
+
+* Fix dependencies not being fetched
+
+## 0.6.0
+
+* Merge duplicated dependencies in spec
+* Always fetch the commit SHA from rev-parse
+
+## 0.5.0
+
+* Allow defining exclusions in spec file
+* Allow forward slash in lock file
+
+## 0.4.0
+
+* Resolve iteratively instead of recursively
+* Fail if there are duplicated dependencies in spec file
+* Merge duplicated dependencies and warn the user
+
+## 0.3.0
+
+* Allow customizing default specfile and receiver downstream
+
+## 0.2.0
+
+* Remove highline gem not actually needed
+* Handle version ranges and 1.x type strings
+* Handle prerelease versions and semver
+* Add a logger warn method
+* Add a better error message if module doesn't exist while resolving dependencies
+
+## 0.1.2
+
+* \#153. Mark the license in the gemspec.
+
+* \#158, \#160, \#159. Handle cyclic dependencies for adapters which opt in to
+  cyclic dependencies.
+
+* \#154. Cache git repository sources which are identical but for their :path
+  attributes (where to look inside the repository for the manifest). Thanks
+  @bcatlin.
+
+* \#161. Fix JRuby exception in posix run! method. Thanks @justenwalker.
+
+* \#163. Don't fetch git repositories multiple times per run. Thanks @njam.
+
+## 0.1.1
+
+* \#147. Handle the case where HOME is not in the environment. Thanks @bradleyd.
+
+* \#140. Properly handle the failure to clone a git repository. Avoid wiping out
+  the host project's changes.
+
+* \#127. Support Rubinius and JRuby, including when shelling out to system
+  commands.
+
+* \#144. Allow running the test suite with a simple `rake`. Thanks @nickhammond.
+
+## 0.1.0
+
+* Extract the chef adapter to its own gem.
+
+## 0.0.26
+
+* \#112. Prevent the git source being confused in certain cases by colorized
+  output from git. HT: @ericpp.
+
+* \#115, \#116. Accommodate cookbook archives generated by `git archive`.
+  HT: @taqtiqa-mark.
+
+* \#119. Support NO_PROXY, a modifier on HTTP_PROXY and friends. HT: @databus23.
+
+* \#121. A github pseudosource. HT: @alno.
+
+* \#122. Follow http redirect responses in the chef site source. HT: @Fleurer.
+
+* Improve the resolver performance by detecting conflicts earlier and
+  backtracking more quickly. This will help avoid certain cases of long
+  resolutions caused by conflicts; the conflicts will still be there, but will
+  be detected more quickly and the resolution terminated more quickly. This
+  changes the resolution algorithm, and new resolutions may differ from older
+  resolutions.
+
+## 0.0.25
+
+* \#71. Fix an error, given certain locale settings, with reading cookbook
+  metadata files.
+
+* \#89. Fix an error when encountering manifests and dependencies with names of
+  a single letter, such as `"R"`.
+
+* \#92, \#99. HTTP proxy support via the `HTTP_PROXY` environment variable. Also
+  supports `HTTP_PROXY_USER` and `HTTP_PROXY_PASS` environment variables. Thanks
+  @tknerr.
+
+* \#97. Enforce that the `:ref` option in the `:git` source may only be given a
+  string.
+
+* \#98. Fix unpacking chef site-sourced packages where the directory in the
+  tarball does not match the cookbook name.
+
+## 0.0.24
+
+* \#15. A remembered configuration system.
+
+* \#16. Configure, and remember configuration for, chef install paths.
+
+* \#38. Configure, and remember configuration for, stripping out `.git`
+  directories from git-sources chef dependencies.
+
+* \#76. Support git annotated tags.
+
+* \#80. Ignore directories in the `PATH` named `git` when looking for the `git`
+  bin. Thanks @avit.
+
+* \#85. Provide a helpful message when running the `show` command without a
+  lockfile present.
+
+## 0.0.23
+
+* \#41. Build gems with a built gemspec.
+
+* \#67. Cache remote objects at the latest possible moments, and only when they
+  are needed.
+
+* \#68. Fix unpacking chef site-sourced packages on Windows by pivoting from a
+  Librarian-managed scratch space, rather than pivoting from Windows' temp
+  directory. There were unexplained problems with using the Windows temp
+  directory in certain cases, possibly related to the temp directory and the
+  Librarian cache directory being on different volumes.
+
+* \#69. Fix invoking Librarian with git-sourced dependencies from git hooks by
+  unsetting `GIT_DIR` around shelling out to git.
+
+* Print general environment information when running with `--verbose`.
+
+## 0.0.22
+
+* Fix the `outdated` CLI command.
+
+## 0.0.21
+
+* \#64. Sources now raise when given unrecognized options in the specfile.
+
+* A new `show` CLI command.
+
+* Changed the `clean` CLI command no longer to delete the lockfile.
+
+* Simplify the architecture of `Librarian::Manifest` vis-a-vis sources. It is no
+  longer a base class for adapters to inherit. Now, sources expose a small
+  interface, which `Librarian::Manifest` can call, for delay-loading attributes.
+
+* The git source now resolves the `git` binary before `chdir`ing.
+
+* Test on Rubinius.
+
+## 0.0.20
+
+* A command to print outdated dependencies.
+
+## 0.0.19
+
+* Fix breakage on 1.8.
+
+## 0.0.18
+
+* \#57. Include existing manifests' dependencies in resolution.
+
+* Permit the update action even with a changed specfile.
+
+## 0.0.17
+
+* Use a pure-Ruby implementation of tar/gz. Helps with Windows support, since
+  Windows boxes are less likely than *NIX boxes to have the `tar` executable.
+
+* Fix an issue where the chef site source considers uncached manifests to be
+  cached, and skips caching them, causing the install action to fail.
+
+* Fail fast if the resolver produces an inconsistent resolution. It is a known
+  issue that the resolver will sometimes (deterministically, not randomly)
+  produce an inconsistent resolution when performing an update action (#57).
+  Start debugging this by failing fast at this point and spitting out gobs of
+  debug-level log details.
+
+## 0.0.16
+
+* Recache site-sourced dependency metadata per each run.
+
+* \#46. Always install.
+
+* \#53. Abstract versions & requirements from rubygems.
+
+* Own the install path. Recreate it on each install.
+    WARNING: If you have your own content in the install path, it will be deleted without mercy.
+
+## 0.0.15
+
+* Rewrite the README.
+
+* \#44, \#49. Better updating of cached git sources without using local merges.
+
+## 0.0.14
+
+* \#39 Fixes a regression induced by using `git reset --hard SHA`.
+
+## 0.0.13
+
+* \#36 Fixes an issue where, if a dependency has a git source (the upstream), and the upstream is updated,
+    then attempting to update that dependency in the local resolution would not update that dependency so
+    long as that git source were cached (@databus23).
+
+* More immediate detection of, and better error messages for, cases of blank dependency or manifest names
+    or cases of names that are otherwise insensible, such as names that are untrimmed.
+
+## 0.0.12
+
+* Fixes an issue where, if a dependency has a git source with a ref, re-resolving may fail.
+
+## 0.0.11
+
+* Fix a regression where the cli command "version" failed.
+
+## 0.0.10
+
+This release focuses on refactoring some of the internals. There are no functional changes.
+
+## 0.0.9
+
+* \#11 Fixes a problem where, if the repo is in a path where a component has a space, attempting to resolve a
+    site-sourced dependency fails.
+
+## 0.0.8
+
+* A `version` task.
+
+* A change log.
+
+* \#10 Fixes the problem with bouncing the lockfile when updating, when using a git source with the default ref.
+
+## 0.0.7
+
+* \#8 Add highline temporarily as a runtime dependency of `librarian` (@fnichol).
+  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
+    be moved to `librarian-chef`. If the project is further split into a knife plugin, the dependency
+    will be moved there.
+
+## 0.0.6
+
+* \#7 Show a better error message when a cookbook is missing the required metadata file.
+
+* Miscellaneous bugfixes.
+
+## 0.0.5
+
+* \#4 An `init` task for `librarian-chef`.
+  This task creates a nearly-blank `Cheffile` with just the default Opscode Community Site source.
+
+* Automatically create the `cookbooks` directory, if it's missing, when running the `install` task.
+
+* \#3 Add `chef` temporarily as a runtime dependency of `librarian` (@fnichol).
+  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
+    be moved to `librarian-chef`.
+
+## 0.0.4
+
+* A simple knife integration.
+  This integration allows you to specify a `librarian-chef`-managed tempdir as a `cookbook_path`.
+  This is useful to force knife only to upload the exact cookbooks that `librarian-chef` knows
+    about, rather than whatever happens to be found in the `cookbooks` directory.
+
+## 0.0.3
+
+* Miscellaneous bugfixes.
+
+## 0.0.2
+
+* An optional `:path` attribute for `:git` sources.
+  This allows you to specify exactly where within a git repository a given cookbook is to be found.
+
+* A full example of a Cheffile and its usage in the readme.
+
+## 0.0.1
+
+* Initial release.

data/README.md

@@ -1,5 +1,10 @@
-Librarian [![Build Status](https://secure.travis-ci.org/voxpupuli/librarian.png)](https://travis-ci.org/voxpupuli/librarian)
-=========
+# Librarian
+
+[![License](https://img.shields.io/github/license/voxpupuli/librarian.svg)](https://github.com/voxpupuli/librarian/blob/master/LICENSE.txt)
+[![Test](https://github.com/voxpupuli/librarian/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/librarian/actions/workflows/test.yml)
+[![Release](https://github.com/voxpupuli/librarian/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/librarian/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/librarian.svg)](https://rubygems.org/gems/librarian)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/librarian.svg)](https://rubygems.org/gems/librarian)
 
 This is a forked version published as `librarianp` with improvements in order to support `librarian-puppet`.
 

data/Rakefile

@@ -26,3 +26,15 @@ Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new('spec')
 task :default => :spec
 
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    version = File.read(File.expand_path('VERSION', __dir__)).strip
+    config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
+    config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
+    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog}
+    config.user = 'voxpupuli'
+    config.project = 'librarian'
+  end
+rescue LoadError
+end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.2

data/lib/librarian/dsl/receiver.rb

@@ -25,8 +25,8 @@ module Librarian
         end
       end
 
-      def run(specfile = nil)
-        specfile = Proc.new if block_given?
+      def run(specfile = nil, &block)
+        specfile = block if block
 
         case specfile
         when Pathname

data/lib/librarian/dsl.rb

@@ -79,14 +79,14 @@ module Librarian
       Receiver.new(target)
     end
 
-    def run(specfile = nil, sources = [])
+    def run(specfile = nil, sources = [], &block)
       specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
 
       Target.new(self).tap do |target|
         target.precache_sources(sources)
         debug_named_source_cache("Pre-Cached Sources", target)
 
-        specfile ||= Proc.new if block_given?
+        specfile ||= block if block_given?
 
         if specfile.kind_of?(Pathname) and !File.exists?(specfile)
           debug { "Specfile #{specfile} not found, using defaults" } unless specfile.nil?

data/lib/librarian/rspec/support/cli_macro.rb

@@ -51,7 +51,7 @@ module Librarian
         def self.included(base)
           base.instance_exec do
             let(:project_path) do
-              project_path = Pathname.new(__FILE__).expand_path
+              project_path = Pathname.pwd.expand_path
               project_path = project_path.dirname until project_path.join("Rakefile").exist?
               project_path
             end

data/lib/librarian/source/git/repository.rb

@@ -44,24 +44,28 @@ module Librarian
         end
 
         def clone!(repository_url)
-          command = %W(clone #{repository_url} . --quiet)
+          command = %W(clone #{repository_url} .)
+          command << '--quiet' unless environment.ui.debug?
           run!(command, :chdir => true)
         end
 
         def checkout!(reference, options ={ })
-          command = %W(checkout #{reference} --quiet)
+          command = %W(checkout #{reference})
+          command << '--quiet' unless environment.ui.debug?
           command << "--force" if options[:force]
           run!(command, :chdir => true)
         end
 
         def fetch!(remote, options = { })
-          command = %W(fetch #{remote} --quiet)
+          command = %W(fetch #{remote})
+          command << '--quiet' unless environment.ui.debug?
           command << "--tags" if options[:tags]
           run!(command, :chdir => true)
         end
 
         def reset_hard!
-          command = %W(reset --hard --quiet)
+          command = %W(reset --hard)
+          command << '--quiet' unless environment.ui.debug?
           run!(command, :chdir => true)
         end
 
@@ -107,12 +111,14 @@ module Librarian
             reference = "#{remote}/#{reference}"
           end
 
-          command = %W(rev-parse #{reference}^{commit} --quiet)
+          command = %W(rev-parse #{reference}^{commit})
+          command << '--quiet' unless environment.ui.debug?
           run!(command, :chdir => true).strip
         end
 
         def current_commit_hash
-          command = %W(rev-parse HEAD --quiet)
+          command = %W(rev-parse HEAD)
+          command << '--quiet' unless environment.ui.debug?
           run!(command, :chdir => true).strip!
         end
 

data/lib/librarian/ui.rb

@@ -56,6 +56,10 @@ module Librarian
         @debug = true
       end
 
+      def debug?
+        @debug
+      end
+
       def debug_line_numbers!
         @debug_line_numbers = true
       end

data/librarianp.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '~> 2.4'
+  gem.required_ruby_version = '>= 2.4', '< 4'
 
   gem.add_dependency "thor", "~> 1.0"
 

data/spec/unit/lockfile/parser_spec.rb

@@ -57,8 +57,7 @@ module Librarian
       it "should give a dependency with the expected requirement" do
         dependency = resolution.dependencies.first
 
-        # Note: it must be this order because this order is lexicographically sorted.
-        expect(dependency.requirement.to_s).to eq "~> 1.1, != 1.2.6"
+        expect(dependency.requirement).to eq Librarian::Dependency::Requirement.new(["~> 1.1", "!= 1.2.6"])
       end
 
       it "should give a dependency wth the expected source" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -89,11 +89,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -199,17 +201,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: A Framework for Bundlers.

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - '2.4'
-  - '2.5'
-  - '2.6'
-deploy:
-  provider: rubygems
-  api_key:
-    secure: "HkdoYaLek2mCT+e7pW0pHMLiIuikUMihfqzspltzmN673HBvMCMZqk4sIm4b3Zi+RMtNTb4dnMxxhehKyyzF88UIRHqV9OUPT3LQLE/BgHThxLD1+CSbVS1SZKY7UfTIcqW3/otORBCI5YAXiycEnRFIe2R/S3n0c/gD9dBcobg="
-  gem: librarianp
-  on:
-    tags: true
-    rvm: '2.6'