modulesync 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+##2015-06-24 - 0.4.0
+
+### Summary
+
+This release adds a --remote-branch flag and adds a global key for template
+config.
+
+#### Features
+
+- Expose --remote-branch
+- Add a global config key
+
+#### Bugfixes
+
+- Fix markdown syntax in README
+
 ##2015-03-12 - 0.3.0
 
 ### Summary

data/README.md

@@ -67,6 +67,9 @@ overridden or extended by adding a file called .sync.yml to the module itself.
 This allows us to, for example, have a set of "required" gems that are added
 to all Gemfiles, and a set of "optional" gems that a single module might add.
 
+Within the templates, values can be accessed in the `@configs` hash, which is
+merged from the values under the keys `:global` and the current file name.
+
 The list of modules to manage is in managed\_modules.yml in the configuration
 directory. This lists just the names of the modules to be managed.
 
@@ -115,7 +118,7 @@ but does not commit or push changes. It is still destructive in that it
 overwrites local changes.
 
 ```
-msync update --noop 
+msync update --noop
 ```
 
 #### Damage mode
@@ -236,6 +239,7 @@ branch: modulesyncbranch
 git_base: 'user@gitlab.example.com:'
 namespace: MySuperOrganization
 branch: modulesyncbranch
+```
 
 ###### Gerrit
 
@@ -256,6 +260,15 @@ If you only want to sync some of the repositories in your managed_modules.yml, u
 msync update -f augeas -m "Commit message"
 msync update -f puppet-a..o "Commit message"
 ```
+
+#### 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:
+
+```
+msync update -r master_new -m "Commit message"
+```
+
 #### Automating updates
 
 If you install a git hook, you need to tell it what remote and branch to push

data/lib/modulesync/cli.rb

@@ -35,7 +35,7 @@ module ModuleSync
       @options.merge!(Hash.transform_keys_to_symbols(Util.parse_config(MODULESYNC_CONF_FILE)))
       @options[:command] = args[0] if commands_available.include?(args[0])
       opt_parser = OptionParser.new do |opts|
-        opts.banner = "Usage: msync update [-m <commit message>] [-c <directory> ] [--noop] [--bump] [--changelog] [--tag] [--tag-pattern <tag_pattern>] [-n <namespace>] [-b <branch>] [-f <filter>] | hook activate|deactivate [-c <directory> ] [-n <namespace>] [-b <branch>]"
+        opts.banner = "Usage: msync update [-m <commit message>] [-c <directory> ] [--noop] [--bump] [--changelog] [--tag] [--tag-pattern <tag_pattern>] [-n <namespace>] [-b <branch>] [-r <branch>] [-f <filter>] | hook activate|deactivate [-c <directory> ] [-n <namespace>] [-b <branch>]"
         opts.on('-m', '--message <msg>',
                 'Commit message to apply to updated modules') do |msg|
           @options[:message] = msg
@@ -52,6 +52,10 @@ module ModuleSync
                 'Branch name to make the changes in. Defaults to "master"') do |branch|
           @options[:branch] = branch
         end
+        opts.on('-r', '--remote-branch <branch>',
+                'Remote branch name to push the changes to. Defaults to the branch name') do |branch|
+          @options[:remote_branch] = branch
+        end
         opts.on('-f', '--filter <filter>',
                 'A regular expression to filter repositories to update.') do |filter|
           @options[:filter] = filter

data/lib/modulesync/constants.rb

@@ -6,5 +6,6 @@ module ModuleSync
     MODULESYNC_CONF_FILE = 'modulesync.yml'
     PROJ_ROOT            = './modules'
     HOOK_FILE            = '.git/hooks/pre-push'
+    GLOBAL_DEFAULTS_KEY  = :global
   end
 end

data/lib/modulesync.rb

@@ -59,10 +59,12 @@ module ModuleSync
         git_base = "#{options[:git_base]}#{options[:namespace]}"
         Git.pull(git_base, puppet_module, options[:branch], opts || {})
         module_configs = Util.parse_config("#{PROJ_ROOT}/#{puppet_module}/#{MODULE_CONF_FILE}")
-        files_to_manage = module_files | defaults.keys | module_configs.keys
+        global_defaults = defaults[GLOBAL_DEFAULTS_KEY] || {}
+        module_defaults = module_configs[GLOBAL_DEFAULTS_KEY] || {}
+        files_to_manage = (module_files | defaults.keys | module_configs.keys) - [GLOBAL_DEFAULTS_KEY]
         files_to_delete = []
         files_to_manage.each do |file|
-          file_configs = (defaults[file] || {}).merge(module_configs[file] || {})
+          file_configs = global_defaults.merge(defaults[file] || {}).merge(module_defaults).merge(module_configs[file] || {})
           file_configs[:puppet_module] = puppet_module
           if file_configs['unmanaged']
             puts "Not managing #{file} in #{puppet_module}"

data/modulesync.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'modulesync'
-  spec.version       = '0.3.0'
+  spec.version       = '0.4.0'
   spec.authors       = ['Colleen Murphy']
   spec.email         = ['colleen@puppetlabs.com']
   spec.summary       = %q{Puppet Module Synchronizer}

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Colleen Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,25 +85,26 @@ files:
 homepage: http://github.com/puppetlabs/modulesync
 licenses:
 - Apache 2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Puppet Module Synchronizer
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bcd0fbe76e6f665fb7122e17a5d6945f7be84bbe
-  data.tar.gz: 5f4e45bc2b44d51fb2b215d022e2269712f47a24
-SHA512:
-  metadata.gz: 150e69be961f2c98a69dd1e7f0469a67337991d01ca66279c61ecdfb63f41fd049682b1f4bafe16dbe5d808a4a3786cb7626ede3b82528c2276d686c9bf5f362
-  data.tar.gz: 326c5d4551c5398f22e635149b9cec5bf09f61047e198cb761910a13ba947cc4dffdd997ca12b14a0b53bd8704f25a4634f07fe6d18d8f33dcd0bcd9b30be5a3