terrafile 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469225ce5f92735515d498168db91d8b9934c3ec6453ffffe4ab0b27c6733670
-  data.tar.gz: 2d0cf01aa1d12fc6c6d234c021164675e7151be5a919cec0c7ca8452d3ef99b7
+  metadata.gz: 4be422a234065c714ad67e455de5b3c330f8a21bfd4662d1913ad4e116bb8a0a
+  data.tar.gz: '07939a6f15d164865a0debcb71885632dfa5eaec869e42d4467b4fdecfa542d6'
 SHA512:
-  metadata.gz: af6611c61844166d9f71514e75d280681cdd90fe00d64e29917faaf4292ee907c68a446967d92273862f3d15eee770281ea251fb537d4c9ee4abbc5e55ffcc50
-  data.tar.gz: 375cda366d6be1d34d626612b737ebfbaeca1dc7102830b6da5541122ddb3c32374f7e9c9b56712c1d46632544264d739e6a26fca1b63297a23e4e9be97a049e
+  metadata.gz: 1326581ca3870aa2d4df2d930fd912c2339e826c1119f3674a2dbce608de52996d50556a62ca74f884ad43b21c7b6094ab0a88b07f0dbd007ae573cf93a728c5
+  data.tar.gz: 0af82f425c8ad201bcb0e6f6b9f4c2cac656ca217aeede14ae43383a732f3af43e8bba17870212fafef88f31e272dd2631a53b37191d35b54d2aea14e1810a02

data/.rubocop.yml

@@ -49,3 +49,4 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
     Exclude:
       - 'spec/**/*'
+      - 'terrafile.gemspec'

data/Gemfile.lock

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

data/Rakefile

@@ -8,5 +8,6 @@ task default: :test
 desc 'run specs, simplecov and rubocop'
 task :test do
   raise 'FAILURE: Failing specs or incomplete coverage!' unless system 'rspec'
+  raise 'FAILURE: Failing integration tests!' unless system 'cucumber'
   raise 'FAILURE: Rubocop violations!' unless system 'rubocop'
 end

data/features/processes_a_terrafile.feature

@@ -0,0 +1,13 @@
+Feature: processes a terrafile
+
+  Background:
+    And a valid Terrafile exists
+
+  Scenario: all modules are installable
+    When I run the _terrafile_ command
+    And I should see that each module listed in the Terrafile is to be installed
+
+  Scenario: modules subdirectory created if not present
+    When I run the _terrafile_ command
+    Then I should see that a _modules_ directory will be created
+

data/features/step_definitions/terrafile_steps.rb

@@ -0,0 +1,31 @@
+Given('a valid Terrafile exists') do
+  content = <<~YML
+    terraform-aws-cloudtrail:
+      source: "git@github.com:deanwilson/terraform-aws-cloudtrail"
+      version: "01ccc3a1816373dff0a0084377e24991dc0212bc"
+
+    terraform-aws-s3-bucket:
+      source: "git@github.com:Smartbrood/terraform-aws-s3-bucket.git"
+      version: "v0.7"
+  YML
+  write_file 'Terrafile', content
+end
+
+When('I run the _terrafile_ command') do
+  run_simple('terrafile', fail_on_error: false)
+end
+
+Then('I should see that a _modules_ directory will be created') do
+  notice = "Creating Terraform modules directory at 'vendor/terraform_modules'"
+  expect(last_command_started.output).to match(/#{notice}/)
+end
+
+Then('I should see that each module listed in the Terrafile is to be installed') do
+  notice1 = 'Checking out 01ccc3a1816373dff0a0084377e24991dc0212bc from ' \
+              'git@github.com:deanwilson/terraform-aws-cloudtrail'
+  notice2 = 'Checking out v0.7 from ' \
+              'git@github.com:Smartbrood/terraform-aws-s3-bucket.git'
+
+  expect(last_command_started.output).to match(/#{notice1}/)
+  expect(last_command_started.output).to match(/#{notice2}/)
+end

data/features/support/aruba.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/features/support/env.rb

@@ -0,0 +1,2 @@
+require 'pry'
+require_relative '../../lib/terrafile'

data/lib/terrafile/dependency.rb

@@ -28,7 +28,7 @@ module Terrafile
 
     def checkout
       Dir.chdir(name) do
-        Helper.run!("git checkout #{version} &> /dev/null")
+        Helper.run!("git checkout #{version} 1> /dev/null")
       end
     end
   end

data/lib/terrafile/helper.rb

@@ -26,7 +26,7 @@ module Terrafile
     end
 
     def self.clone(source, destination)
-      run!("git clone --depth 1 #{source} #{destination} &> /dev/null")
+      run!("git clone #{source} #{destination} 1> /dev/null")
     end
 
     def self.dir_exists?(path)
@@ -44,7 +44,7 @@ module Terrafile
     end
 
     def self.pull_repo
-      run!('git pull &> /dev/null')
+      run!('git pull 1> /dev/null')
     end
   end
 end

data/lib/terrafile/installer.rb

@@ -1,7 +1,5 @@
 module Terrafile
   class Installer
-    MODULES_PATH = 'vendor/terraform_modules'.freeze
-
     def initialize
       @dependencies = read_terrafile
     end
@@ -27,7 +25,7 @@ module Terrafile
     end
 
     def checkout_modules
-      Dir.chdir(Installer::MODULES_PATH) do
+      Dir.chdir(Terrafile::MODULES_PATH) do
         dependencies.each do |dependency|
           msg = "Checking out #{dependency.version} from #{dependency.source}"
           Kernel.puts msg

data/lib/terrafile/version.rb

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

data/lib/terrafile.rb

@@ -9,4 +9,5 @@ require_relative 'terrafile/installer'
 
 module Terrafile
   TERRAFILE_PATH = 'Terrafile'.freeze
+  MODULES_PATH = File.join('vendor', 'terraform_modules').freeze
 end

data/spec/spec_helper.rb

@@ -3,9 +3,8 @@ SimpleCov.start do
   minimum_coverage 100
 end
 require 'bundler/setup'
-require 'aruba/rspec'
 require 'terrafile'
-# require 'pry'
+require 'pry'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/spec/unit/dependency_spec.rb

@@ -141,10 +141,10 @@ module Terrafile
           expect(Dir).to have_received(:chdir).with('terraform-of-mine')
         end
 
-        it 'checks out the right version of that dependency, suppressing output' do
+        it 'checks out the right version of that dependency, suppressing STDOUT' do
           dependency.checkout
 
-          expect(Helper).to have_received(:run!).with('git checkout 1.2.3 &> /dev/null')
+          expect(Helper).to have_received(:run!).with('git checkout 1.2.3 1> /dev/null')
         end
       end
     end

data/spec/unit/helper_spec.rb

@@ -112,7 +112,7 @@ module Terrafile
     end
 
     describe '::clone(source, destination)' do
-      it 'checks out the given revision using run!' do
+      it 'checks out the given revision using run! suppressing STDOUT' do
         allow(Helper).to receive(:run!)
         source = 'git@github.com:org1/repo1'
         destination = 'terraform-aws-name1'
@@ -120,7 +120,7 @@ module Terrafile
         Helper.clone(source, destination)
 
         expect(Helper).to have_received(:run!)
-          .with("git clone --depth 1 #{source} #{destination} &> /dev/null")
+          .with("git clone #{source} #{destination} 1> /dev/null")
       end
     end
 
@@ -170,12 +170,12 @@ module Terrafile
     end
 
     describe '::pull_repo' do
-      it 'pulls the latest code without generating any output' do
+      it 'pulls the latest code suppressing STDOUT' do
         allow(Helper).to receive(:run!)
 
         Helper.pull_repo
 
-        expect(Helper).to have_received(:run!).with('git pull &> /dev/null')
+        expect(Helper).to have_received(:run!).with('git pull 1> /dev/null')
       end
     end
   end

data/spec/unit/installer_spec.rb

@@ -65,7 +65,7 @@ module Terrafile
         context 'when the directory already exists' do
           before do
             allow(Helper).to receive(:dir_exists?)
-              .with(Installer::MODULES_PATH).and_return(true)
+              .with(Terrafile::MODULES_PATH).and_return(true)
           end
 
           it 'does not attempt to make the directory' do
@@ -77,7 +77,7 @@ module Terrafile
         context 'when the directory does NOT exist' do
           before do
             allow(Helper).to receive(:dir_exists?)
-              .with(Installer::MODULES_PATH).and_return(false)
+              .with(Terrafile::MODULES_PATH).and_return(false)
           end
 
           it 'notifies us of its intention to make the directory' do
@@ -87,7 +87,7 @@ module Terrafile
 
           it 'makes the directory' do
             Installer.new.call
-            expect(FileUtils).to have_received(:makedirs).with(Installer::MODULES_PATH)
+            expect(FileUtils).to have_received(:makedirs).with(Terrafile::MODULES_PATH)
           end
         end
       end
@@ -133,7 +133,7 @@ module Terrafile
 
         it 'changes to the module installation directory' do
           Installer.new.call
-          expect(Dir).to have_received(:chdir).with(Installer::MODULES_PATH)
+          expect(Dir).to have_received(:chdir).with(Terrafile::MODULES_PATH)
         end
 
         describe 'for each dependency' do

data/terrafile.gemspec

@@ -13,24 +13,14 @@ Gem::Specification.new do |spec|
   spec.summary               = 'Installs the modules listed in Terrafile'
   spec.description           = 'Terraform modules listed in Terrafile are installed in ' \
                                  'vendor/terraform_modules'
-  # spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.homepage              = 'https://github.com/dxw/terrafile'
   spec.license               = 'MIT'
   spec.post_install_message  = 'Thanks for installing terrafile.'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  spec.metadata['credit'] = 'Original code and rationale found at: ' \
-    'http://bensnape.com/2016/01/14/terraform-design-patterns-the-terrafile/'
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-  #   spec.metadata["homepage_uri"] = spec.homepage
-  #   spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  #   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
+  if spec.respond_to?(:metadata)
+    spec.metadata['credit'] = 'Original code and rationale found at: ' \
+      'http://bensnape.com/2016/01/14/terraform-design-patterns-the-terrafile/'
+  end
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafile
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - dxw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -129,20 +129,23 @@ files:
 - Rakefile
 - bin/setup
 - bin/terrafile
+- features/processes_a_terrafile.feature
+- features/step_definitions/terrafile_steps.rb
+- features/support/aruba.rb
+- features/support/env.rb
 - lib/terrafile.rb
 - lib/terrafile/dependency.rb
 - lib/terrafile/errors.rb
 - lib/terrafile/helper.rb
 - lib/terrafile/installer.rb
 - lib/terrafile/version.rb
-- spec/integration/runs_terrafile_executable_spec.rb
 - spec/spec_helper.rb
 - spec/terrafile_spec.rb
 - spec/unit/dependency_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/installer_spec.rb
 - terrafile.gemspec
-homepage: 
+homepage: https://github.com/dxw/terrafile
 licenses:
 - MIT
 metadata:
@@ -168,7 +171,6 @@ signing_key:
 specification_version: 4
 summary: Installs the modules listed in Terrafile
 test_files:
-- spec/integration/runs_terrafile_executable_spec.rb
 - spec/spec_helper.rb
 - spec/terrafile_spec.rb
 - spec/unit/dependency_spec.rb

data/spec/integration/runs_terrafile_executable_spec.rb

@@ -1,47 +0,0 @@
-require_relative '../spec_helper'
-
-module Terrafile
-  RSpec.describe 'CLI runs terrafile executable', type: :aruba do
-    context 'when no Terrafile is found' do
-      let(:file)    { 'Bananafile' }
-      let(:content) { 'Something else entirely' }
-      let(:output)  { 'Terrafile does not exist' }
-
-      before(:each) { write_file file, content }
-      before(:each) { run('terrafile') }
-
-      it 'prints out an error message' do
-        expect(last_command_started).to have_output(/#{output}/)
-      end
-
-      it 'exits non-zero' do
-        expect(last_command_started).not_to have_exit_status(0)
-      end
-    end
-
-    context 'when a Terrafile IS found' do
-      let(:file)    { 'Terrafile' }
-      let(:content) do
-        <<~YML
-          terraform-aws-module1:
-            source: "git@github.com:org1/repo1.git"
-            version: "0.8.0"
-
-          terraform-aws-module2:
-            source: "git@github.com:org2/repo2.git"
-            version: "004e5791c2ef816578420fb6695e4009a838c863"
-        YML
-      end
-      let(:notice)  { 'Creating Terraform modules directory' }
-
-      before(:each) { write_file file, content }
-      before(:each) { run('terrafile') }
-
-      context 'and the modules directory does not yet exist' do
-        it 'prints out its intention to create that directory' do
-          expect(last_command_started).to have_output(/#{notice}/)
-        end
-      end
-    end
-  end
-end