modulesync 0.6.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1dd5e56a7370a3eb358c9a6d1fdf28aab8078ba9
+  data.tar.gz: 444ba255257e89d604065e066978f028d798907d
+SHA512:
+  metadata.gz: fa110f5ccfaa83e13be484e0d443cbddc50b97706dda6fa9b6080bb9bf509fbff0ecc7953dfd1014b40bae0baf5a5c214d49ec96cb640b5a1b1d13269cf51d8c
+  data.tar.gz: 8629e474f0b8998f5707954204a37ab94006d056640f2f438bca92fa6c4694238e7a4657281c8c2d0bf35c810da5fb26176da0da5a3e77472fb242743fb3063c

data/.gitignore

@@ -2,3 +2,4 @@ tmp/
 modules/
 *.gem
 Gemfile.lock
+.bundle/

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=documentation

data/.rubocop.yml

@@ -0,0 +1,16 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 1.9
+  Exclude:
+    - 'vendor/**/*'
+    - 'tmp/**/*'
+    - 'pkg/**/*'
+
+# we still support ruby 1.8
+Style/HashSyntax:
+  Enabled: false
+
+# dealbreaker:
+Style/TrailingCommaInLiteral:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,75 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-10-07 12:25:07 -0700 using RuboCop version 0.34.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/modulesync.rb'
+    - 'lib/modulesync/cli.rb'
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 64
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 105
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 29
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 319
+
+# Offense count: 8
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 79
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 140
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 16
+
+# Offense count: 9
+# Configuration parameters: Exclude.
+Style/Documentation:
+  Exclude:
+    - 'lib/modulesync.rb'
+    - 'lib/modulesync/cli.rb'
+    - 'lib/modulesync/constants.rb'
+    - 'lib/modulesync/git.rb'
+    - 'lib/modulesync/hook.rb'
+    - 'lib/modulesync/renderer.rb'
+    - 'lib/modulesync/util.rb'
+
+# Offense count: 1
+Style/EachWithObject:
+  Exclude:
+    - 'lib/modulesync/util.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/modulesync/cli.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'lib/modulesync/util.rb'

data/.travis.yml

@@ -2,8 +2,24 @@
 sudo: false
 language: ruby
 cache: bundler
+before_install:
+  - gem update --system
+  - gem install bundler
 script: 'bundle exec rake test'
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
+  - 2.2
+  - 2.3.3
+  - 2.4.0
+deploy:
+  provider: rubygems
+  api_key:
+    secure: "Tbf1EbLEobIIox+fftJZADZsfQQ6kl0urcMNetK7NJzFo/negD/WyJIUj3kro/B7buyYADEjTui/JR4o8EPbugfM3ie5vYOd5k3AesSzbdr4BSwGe/cGbGOB7/PZuGfFLkb94/FiCU2mIwibkbh1rHWGlBoPj7ntL0+5ZtdvsM4="
+  gem: modulesync
+  on:
+    rvm: 2.4.0
+    tags: true
+    all_branches: true
+    repo: voxpupuli/modulesync

data/CHANGELOG.md

@@ -1,4 +1,42 @@
-##2015-08-13 - 0.6.1
+# Changelog
+
+## 2017-02-13 - 0.7.2
+
+Fixes an issue releasing 0.7.1, no functional changes.
+
+## 2017-02-13 - 0.7.1
+
+Fixes an issue releasing 0.7.0, no functional changes.
+
+## 2017-02-13 - 0.7.0
+
+### Summary
+
+This is the first release from Vox Pupuli, which has taken over maintenance of
+modulesync.
+
+#### Features
+- New `msync update` arguments:
+    - `--git-base` to override `git_base`, e.g. for read-only git clones
+    - `-s` to skip the current module and continue on error
+    - `-x` for a negative filter (blacklist) of modules not to update
+- Add `-a` argument to `msync hook` to pass additional arguments
+- Add `:git_base` and `:namespace` data to `@configs` hash
+- Allow `managed_modules.yml` to list modules with a different namespace
+- Entire directories can be listed with `unmanaged: true`
+
+#### Refactoring
+- Replace CLI optionparser with thor
+
+#### Bugfixes
+- Fix git 1.8.0 compatibility, detecting when no files are changed
+- Fix `delete: true` feature, now deletes files correctly
+- Fix handling of `:global` config entries, not interpreted as a path
+- Fix push without force to remote branch when no files have changed (#102)
+- Output template name when ERB rendering fails
+- Remove extraneous whitespace in `--noop` output
+
+## 2015-08-13 - 0.6.1
 
 ### Summary
 
@@ -27,7 +65,7 @@ This release adds two new flags to help modulesync better integrate with CI tool
 
 - Added tests
 
-##2015-06-30 - 0.5.0
+## 2015-06-30 - 0.5.0
 
 ### Summary
 
@@ -37,7 +75,7 @@ This release adds the ability to sync a non-bare local git repo.
 
 - Allow one to sync non-bare local git repository
 
-##2015-06-24 - 0.4.0
+## 2015-06-24 - 0.4.0
 
 ### Summary
 
@@ -53,7 +91,7 @@ config.
 
 - Fix markdown syntax in README
 
-##2015-03-12 - 0.3.0
+## 2015-03-12 - 0.3.0
 
 ### Summary
 
@@ -87,14 +125,14 @@ number of new flags for updating modules.
 - Fix non-master branch functionality
 - Add workarounds for older git versions
 
-##2014-11-16 - 0.2.0
+## 2014-11-16 - 0.2.0
 
 ### Summary
 
 This release adds the --filter flag to filter what modules to sync.
 Also fixes the README to document the very important -m flag.
 
-##2014-9-29 - 0.1.0
+## 2014-9-29 - 0.1.0
 
 ### Summary
 

data/Gemfile

@@ -1,3 +1,8 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
+if ENV['TRAVIS_RUBY_VERSION'] && ENV['TRAVIS_RUBY_VERSION'] == '1.9.3'
+  gem 'json_pure', '~> 1.0'
+  gem 'rubocop', '< 0.42.0'
+end
+
 gemspec

data/README.md

@@ -265,13 +265,22 @@ pre_commit_script: openstack-commit-msg-hook.sh
 
 #### Filtering Repositories
 
-If you only want to sync some of the repositories in your managed_modules.yml, use the -f flag to filter by a regex:
+If you only want to sync some of the repositories in your managed_modules.yml, use the `-f` flag to filter by a regex:
 
 ```
-msync update -f augeas -m "Commit message"
+msync update -f augeas -m "Commit message"    # acts only on the augeas module
 msync update -f puppet-a..o "Commit message"
 ```
 
+If you want to skip syncing some of the repositories in your managed_modules.yml, use the `-x` flag to filter by a regex:
+
+```
+msync update -x augeas -m "Commit message"    # acts on all modules except the augeas module
+msync update -x puppet-a..o "Commit message"
+```
+
+If no `-f` is specified, all repository are processed, if no `-x` is specified no repository is skipped. If a repository matches both `-f` and `-x` it is skipped.
+
 #### Pushing to a different remote branch
 
 If you want to push the modified branch to a different remote branch, you can use the -r flag:
@@ -337,6 +346,16 @@ current date, bumped (minor) version, and commit message.
 If `CHANGELOG.md` is absent in the repository, nothing will happen.
 
 
+#### Defining templates
+
+As commented, files within moduleroot directory can be flat files or ERB templates. These files have direct access to @configs hash, which gets values from config_defaults.yml file and from the module being processed:
+
+```
+<%= @configs[:git_base] %>
+<%= @configs[:namespace] %>
+<%= @configs[:puppet_module] %>
+```
+
 The Templates
 -------------
 

data/Rakefile

@@ -1,11 +1,21 @@
 require 'rake/clean'
 require 'cucumber/rake/task'
+require 'rubocop/rake_task'
 
-CLEAN.include("pkg/", "tmp/")
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  puts 'rspec not installed - skipping unit test task setup'
+end
+
+RuboCop::RakeTask.new
+
+CLEAN.include('pkg/', 'tmp/')
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = ""
-  t.cucumber_opts << "--format pretty"
+  t.cucumber_opts = ''
+  t.cucumber_opts << '--format pretty'
 end
 
-task :test => [:clean, :cucumber]
+task :test => [:clean, :spec, :cucumber, :rubocop]

data/bin/msync

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 lib = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib) unless $:.include?(lib)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'modulesync'
+require 'modulesync/cli'
 
-ModuleSync.run(ARGV)
+ModuleSync::CLI::Base.start(ARGV)

data/features/cli.feature

@@ -0,0 +1,18 @@
+Feature: CLI
+  ModuleSync needs to have a robust command line interface
+
+  Scenario: When passing no arguments to the msync command
+    When I run `msync`
+    And the output should match /Commands:/
+
+  Scenario: When passing invalid arguments to the msync update command
+    When I run `msync update`
+    And the output should match /No value provided for required option/
+
+  Scenario: When passing invalid arguments to the msync hook command
+    When I run `msync hook`
+    And the output should match /Commands:/
+
+  Scenario: When running the help subcommand
+    When I run `msync help`
+    And the output should match /Commands:/

data/features/hook.feature

@@ -0,0 +1,28 @@
+Feature: hook
+  ModuleSync needs to update git pre-push hooks
+
+  Scenario: Activating a hook
+    Given a directory named ".git/hooks"
+    When I run `msync hook activate`
+    Then the exit status should be 0
+    Given I run `cat .git/hooks/pre-push`
+    Then the output should contain "bash"
+
+  Scenario: Deactivating a hook
+    Given a file named ".git/hooks/pre-push" with:
+      """
+      git hook
+      """
+    When I run `msync hook deactivate`
+    Then the exit status should be 0
+    Then the file ".git/hooks/pre-push" should not exist
+
+  Scenario: Activating a hook with arguments
+    Given a directory named ".git/hooks"
+    When I run `msync hook activate -a '--foo bar --baz quux' -b master`
+    Then the exit status should be 0
+    Given I run `cat .git/hooks/pre-push`
+    Then the output should match:
+      """
+      "\$message" -n puppetlabs -b master --foo bar --baz quux
+      """

data/features/step_definitions/git_steps.rb

@@ -0,0 +1,24 @@
+Given 'a mocked git configuration' do
+  steps %(
+    Given a mocked home directory
+    And I run `git config --global user.name Test`
+    And I run `git config --global user.email test@example.com`
+  )
+end
+
+Given 'a remote module repository' do
+  steps %(
+    Given a directory named "sources"
+    And I run `git clone https://github.com/maestrodev/puppet-test sources/puppet-test`
+    And a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+  )
+  write_file('modulesync.yml', <<-EOS)
+---
+  namespace: sources
+  git_base: file://#{expand_path('.')}/
+  EOS
+end

data/features/update.feature

@@ -26,11 +26,15 @@ Feature: update
       """
     When I run `msync update --noop`
     Then the exit status should be 0
-    And the output should match /Files added:\s+test/
+    And the output should match:
+      """
+      Files added:
+      test
+      """
     Given I run `cat modules/puppet-test/test`
     Then the output should contain "aruba"
 
-  Scenario: Adding a new file into foobar project-root
+  Scenario: Adding a file that ERB can't parse
     Given a file named "managed_modules.yml" with:
       """
       ---
@@ -51,13 +55,40 @@ Feature: update
     And a directory named "moduleroot"
     And a file named "moduleroot/test" with:
       """
-      <%= @configs['name'] %>
+      <% @configs.each do |c| -%>
+        <%= c['name'] %>
+      <% end %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 1
+
+  Scenario: Using skip_broken option with invalid files
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
       """
-    When I run `msync update --noop --project-root=foobar`
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test" with:
+      """
+      <% @configs.each do |c| -%>
+        <%= c['name'] %>
+      <% end %>
+      """
+    When I run `msync update --noop -s`
     Then the exit status should be 0
-    And the output should match /Files added:\s+test/
-    Given I run `cat foobar/puppet-test/test`
-    Then the output should contain "aruba"
 
   Scenario: Modifying an existing file
     Given a file named "managed_modules.yml" with:
@@ -86,7 +117,7 @@ Feature: update
     Then the exit status should be 0
     And the output should match:
       """
-      Files changed:\s+
+      Files changed:
       +diff --git a/Gemfile b/Gemfile
       """
     Given I run `cat modules/puppet-test/Gemfile`
@@ -95,6 +126,164 @@ Feature: update
       source 'https://somehost.com'
       """
 
+  Scenario: Modifying an existing file and committing the change
+    Given a mocked git configuration
+    And a remote module repository
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      Gemfile:
+        gem_source: https://somehost.com
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/Gemfile" with:
+      """
+      source '<%= @configs['gem_source'] %>'
+      """
+    When I run `msync update -m "Update Gemfile" -r test`
+    Then the exit status should be 0
+    Given I cd to "sources/puppet-test"
+    And I run `git checkout test`
+    Then the file "Gemfile" should contain:
+      """
+      source 'https://somehost.com'
+      """
+
+  Scenario: Setting an existing file to unmanaged
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      Gemfile:
+        unmanaged: true
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/Gemfile" with:
+      """
+      source '<%= @configs['gem_source'] %>'
+      """
+    When I run `msync update --noop`
+    Then the output should not match:
+      """
+      Files changed:
+      +diff --git a/Gemfile b/Gemfile
+      """
+    And the output should match:
+      """
+      Not managing Gemfile in puppet-test
+      """
+    And the exit status should be 0
+    Given I run `cat modules/puppet-test/Gemfile`
+    Then the output should contain:
+      """
+      source 'https://rubygems.org'
+      """
+
+  Scenario: Setting an existing file to deleted
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      Gemfile:
+        delete: true
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/Gemfile" with:
+      """
+      source '<%= @configs['gem_source'] %>'
+      """
+    When I run `msync update --noop`
+    Then the output should match:
+      """
+      Files changed:
+      diff --git a/Gemfile b/Gemfile
+      deleted file mode 100644
+      """
+    And the exit status should be 0
+
+  Scenario: Setting a non-existent file to deleted
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      doesntexist_file:
+        delete: true
+      """
+    And a directory named "moduleroot"
+    When I run `msync update -m 'deletes a file that doesnt exist!' -f puppet-test`
+    And the exit status should be 0
+
+  Scenario: Setting a directory to unmanaged
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppetlabs-apache
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: puppetlabs
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      spec:
+        unmanaged: true
+      """
+    And a directory named "moduleroot/spec"
+    And a file named "moduleroot/spec/spec_helper.rb" with:
+      """
+      some spec_helper fud
+      """
+    And a directory named "modules/puppetlabs-apache/spec"
+    And a file named "modules/puppetlabs-apache/spec/spec_helper.rb" with:
+      """
+      This is a fake spec_helper!
+      """
+    When I run `msync update --offline`
+    Then the output should contain:
+      """
+      Not managing spec/spec_helper.rb in puppetlabs-apache
+      """
+    And the exit status should be 0
+    Given I run `cat modules/puppetlabs-apache/spec/spec_helper.rb`
+    Then the output should contain:
+      """
+      This is a fake spec_helper!
+      """
+    And the exit status should be 0
+
   Scenario: Adding a new file in a new subdirectory
     Given a file named "managed_modules.yml" with:
       """
@@ -124,7 +313,7 @@ Feature: update
     Then the exit status should be 0
     And the output should match:
       """
-      Files added:\s+
+      Files added:
       spec/spec_helper.rb
       """
     Given I run `cat modules/puppet-test/spec/spec_helper.rb`
@@ -132,24 +321,210 @@ Feature: update
       """
       require 'puppetlabs_spec_helper/module_helper'
       """
-    When I run `msync update --offline --noop`
+
+  Scenario: Updating offline
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      spec/spec_helper.rb:
+        require:
+          - puppetlabs_spec_helper/module_helper
+      """
+    And a file named "moduleroot/spec/spec_helper.rb" with:
+      """
+      <% @configs['require'].each do |required| -%>
+        require '<%= required %>'
+      <% end %>
+      """
+    When I run `msync update --offline`
+    Then the exit status should be 0
+    And the output should not match /Files (changed|added|deleted):/
+
+  Scenario: Pulling a module that already exists in the modules directory
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      spec/spec_helper.rb:
+        require:
+          - puppetlabs_spec_helper/module_helper
+      """
+    And a file named "moduleroot/spec/spec_helper.rb" with:
+      """
+      <% @configs['require'].each do |required| -%>
+        require '<%= required %>'
+      <% end %>
+      """
+    Given I run `git init modules/puppet-test`
+    Given a file named "modules/puppet-test/.git/config" with:
+      """
+      [core]
+          repositoryformatversion = 0
+          filemode = true
+          bare = false
+          logallrefupdates = true
+          ignorecase = true
+          precomposeunicode = true
+      [remote "origin"]
+          url = https://github.com/maestrodev/puppet-test.git
+          fetch = +refs/heads/*:refs/remotes/origin/*
+      """
+    When I run `msync update --noop`
     Then the exit status should be 0
     And the output should match:
       """
-      Files added:\s+
+      Files added:
       spec/spec_helper.rb
       """
-    When I run `msync update --offline`
+
+  Scenario: When running update with no changes
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a directory named "moduleroot"
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should not match /diff/
+
+  Scenario: When specifying configurations in managed_modules.yml
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        puppet-test:
+          module_name: test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+
+  Scenario: When specifying configurations in managed_modules.yml and using a filter
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        puppet-blacksmith:
+        puppet-test:
+          module_name: test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop -f puppet-test`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+    And a directory named "modules/puppet-blacksmith" should not exist
+
+  Scenario: When specifying configurations in managed_modules.yml and using a negative filter
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        puppet-blacksmith:
+        puppet-test:
+          module_name: test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test" with:
+      """
+      <%= @configs['name'] %>
+      """
+    When I run `msync update --noop -x puppet-blacksmith`
     Then the exit status should be 0
     And the output should match:
       """
+      Files added:
+      test
       """
+    Given I run `cat modules/puppet-test/test`
+    Then the output should contain "aruba"
+    And a directory named "modules/puppet-blacksmith" should not exist
 
   Scenario: Updating a module with a .sync.yml file
     Given a file named "managed_modules.yml" with:
       """
       ---
-        - puppetlabs-stdlib
+        - puppet-test
       """
     And a file named "modulesync.yml" with:
       """
@@ -169,33 +544,122 @@ Feature: update
         require '<%= required %>'
       <% end %>
       """
-    And a file named "moduleroot/.travis.yml" with:
-      """
-      ---
-      sudo: false
-      language: ruby
-      cache: bundler
-      bundler_args: --without system_tests
-      script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
-      matrix:
-        fast_finish: true
-        include:
-        - rvm: 1.8.7
-          env: PUPPET_GEM_VERSION="~> 3.0"
-        - rvm: 1.9.3
-          env: PUPPET_GEM_VERSION="~> 3.0"
-        - rvm: 2.1.5
-          env: PUPPET_GEM_VERSION="~> 3.0"
-        - rvm: 2.1.5
-          env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-        - rvm: 2.1.6
-          env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-      notifications:
-        email: false
+    Given I run `git init modules/puppet-test`
+    Given a file named "modules/puppet-test/.git/config" with:
+      """
+      [core]
+          repositoryformatversion = 0
+          filemode = true
+          bare = false
+          logallrefupdates = true
+          ignorecase = true
+          precomposeunicode = true
+      [remote "origin"]
+          url = https://github.com/maestrodev/puppet-test.git
+          fetch = +refs/heads/*:refs/remotes/origin/*
+      """
+    Given a file named "modules/puppet-test/.sync.yml" with:
+      """
+      ---
+      spec/spec_helper.rb:
+        unmanaged: true
       """
     When I run `msync update --noop`
     Then the exit status should be 0
     And the output should match:
       """
-      Not managing spec/spec_helper.rb in puppetlabs-stdlib
+      Not managing spec/spec_helper.rb in puppet-test
+      """
+
+  Scenario: Module with custom namespace
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+        - electrical/puppet-lib-file_concat
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      test:
+        name: aruba
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/test" with:
+      """
+      <%= @configs['name'] %>
       """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files added:
+      test
+      """
+    Given I run `cat modules/puppet-test/.git/config`
+    Then the output should contain "url = https://github.com/maestrodev/puppet-test.git"
+    Given I run `cat modules/puppet-lib-file_concat/.git/config`
+    Then the output should contain "url = https://github.com/electrical/puppet-lib-file_concat.git"
+
+  Scenario: Modifying an existing file with values expoxed by the module
+    Given a file named "managed_modules.yml" with:
+      """
+      ---
+        - puppet-test
+      """
+    And a file named "modulesync.yml" with:
+      """
+      ---
+        namespace: maestrodev
+        git_base: https://github.com/
+      """
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      README.md:
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/README.md" with:
+      """
+      echo '<%= @configs[:git_base] + @configs[:namespace] %>'
+      """
+    When I run `msync update --noop`
+    Then the exit status should be 0
+    And the output should match:
+      """
+      Files changed:
+      +diff --git a/README.md b/README.md
+      """
+    Given I run `cat modules/puppet-test/README.md`
+    Then the output should contain:
+      """
+      echo 'https://github.com/maestrodev'
+      """
+
+  Scenario: Running the same update twice and pushing to a remote branch
+    Given a mocked git configuration
+    And a remote module repository
+    And a file named "config_defaults.yml" with:
+      """
+      ---
+      Gemfile:
+        gem_source: https://somehost.com
+      """
+    And a directory named "moduleroot"
+    And a file named "moduleroot/Gemfile" with:
+      """
+      source '<%= @configs['gem_source'] %>'
+      """
+    When I run `msync update -m "Update Gemfile" -r test`
+    Then the exit status should be 0
+    Given I remove the directory "modules"
+    When I run `msync update -m "Update Gemfile" -r test`
+    Then the exit status should be 0
+    Then the output should not contain "error"
+    Then the output should not contain "rejected"