terrafile 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be422a234065c714ad67e455de5b3c330f8a21bfd4662d1913ad4e116bb8a0a
-  data.tar.gz: '07939a6f15d164865a0debcb71885632dfa5eaec869e42d4467b4fdecfa542d6'
+  metadata.gz: ec435e7bda54bb9a01f56703378fe41f59149f4ab57348402339804110d242b1
+  data.tar.gz: a5fc874f164a976027417f38672ea11abaef537f0addc3f36c3ec9ec3d3b4fde
 SHA512:
-  metadata.gz: 1326581ca3870aa2d4df2d930fd912c2339e826c1119f3674a2dbce608de52996d50556a62ca74f884ad43b21c7b6094ab0a88b07f0dbd007ae573cf93a728c5
-  data.tar.gz: 0af82f425c8ad201bcb0e6f6b9f4c2cac656ca217aeede14ae43383a732f3af43e8bba17870212fafef88f31e272dd2631a53b37191d35b54d2aea14e1810a02
+  metadata.gz: cba7f959571593cd0102937473696a7991dd6e500db77011f05faac8ec89089d9745de5fb39c380201bcd3d738dd15dfc39088216c750c538d02b9d9274747fc
+  data.tar.gz: 5ea1f7e281c0b136de80b4b978e188233fa3a18ae8ab5c5af77fd2d24ba8450fb0c03ac30798fc906273c1e266f1b6ecf8fcd14108c05de6bfa041a35664259f

data/CODEOWNERS

@@ -0,0 +1 @@
+*       @dxw/ops @dxw/dalmatian @edavey

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terrafile (0.1.1)
+    terrafile (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Ed Davey
+Copyright (c) 2018 dxw
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -34,9 +34,13 @@ Invoke the executable from your shell:
 
 to install the modules listed in `Terrafile` into `vendor/terraform_modules`.
 
-## Development
+## Dependencies
+
+- git
+- Ruby (>= 2.5.1)
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+## Development
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
@@ -47,9 +51,22 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Then you can run `$ terrafile` to run the latest version
 
+### Tests
+
+Run the test suite with: 
+
+    rake test
+
+The task will:
+
+- run unit tests with 'rspec'
+- enforce 100% coverage with 'simplecov'
+- lint the Ruby code with 'rubocop'
+- run integration tests with 'cucumber'
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/terrafile. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/dxw/terrafile. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/terrafile/dependency.rb

@@ -30,6 +30,11 @@ module Terrafile
       Dir.chdir(name) do
         Helper.run!("git checkout #{version} 1> /dev/null")
       end
+    rescue Error => error
+      raise unless error.message.match?(/reference is not a tree/)
+
+      Kernel.puts "[*] WARN: #{error} ." \
+        "The 'version' should be the branch name or tag, rather than the SHA."
     end
   end
 end

data/lib/terrafile/installer.rb

@@ -28,7 +28,7 @@ module Terrafile
       Dir.chdir(Terrafile::MODULES_PATH) do
         dependencies.each do |dependency|
           msg = "Checking out #{dependency.version} from #{dependency.source}"
-          Kernel.puts msg
+          Kernel.puts "[*] #{msg}"
           dependency.fetch
           dependency.checkout
         end

data/lib/terrafile/version.rb

@@ -1,3 +1,3 @@
 module Terrafile
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/spec/unit/dependency_spec.rb

@@ -146,6 +146,43 @@ module Terrafile
 
           expect(Helper).to have_received(:run!).with('git checkout 1.2.3 1> /dev/null')
         end
+
+        describe 'error handling' do
+          context 'when git checkout reports a "reference is not a tree" error' do
+            let(:msg) { 'fatal: reference is not a tree:' }
+            let(:notice) do
+              "The 'version' should be the branch name or tag, " \
+                'rather than the SHA.'
+            end
+
+            before do
+              allow(Kernel).to receive(:puts)
+              allow(Helper).to receive(:run!).and_raise(Error, msg)
+            end
+
+            it 'logs the suspected use of a SHA rather than a tag or branch name' do
+              dependency.checkout
+              expect(Kernel).to have_received(:puts).with(/WARN: #{msg}/)
+              expect(Kernel).to have_received(:puts).with(/#{notice}/)
+            end
+
+            it 'allows execution to continue' do
+              expect { dependency.checkout }.not_to raise_error
+            end
+          end
+
+          context 'when git checkout reports some other error' do
+            let(:msg) { 'fatal: some other problem:' }
+
+            before do
+              allow(Helper).to receive(:run!).and_raise(Error, msg)
+            end
+
+            it 're-raises the Terraform::Error' do
+              expect { dependency.checkout }.to raise_error(Error, msg)
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrafile
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - dxw
@@ -121,13 +121,13 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/setup
 - bin/terrafile
 - features/processes_a_terrafile.feature
 - features/step_definitions/terrafile_steps.rb

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here