modulesync 0.6.1 → 0.7.2

data/lib/modulesync/hook.rb

@@ -1,36 +1,40 @@
+require 'modulesync'
+
 module ModuleSync
-  module Hook
-    include Constants
+  class Hook
+    attr_reader :hook_file, :namespace, :branch, :args
+
+    def initialize(hook_file, options = [])
+      @hook_file = hook_file
+      @namespace = options['namespace']
+      @branch = options['branch']
+      @args = options['hook_args']
+    end
 
-    def self.activate(args)
-      repo = args[:configs]
-      hook_args = ''
-      hook_args <<= " -n #{args[:namespace]}" if args[:namespace]
-      hook_args <<= " -b #{args[:branch]}" if args[:branch]
-      hook = <<EOF
+    def content(arguments)
+      <<-EOF
 #!/usr/bin/env bash
 
 current_branch=\`git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,'\`
 git_dir=\`git rev-parse --show-toplevel\`
 message=\`git log -1 --format=%B\`
-msync -m "\$message"#{hook_args}
+msync -m "\$message" #{arguments}
 EOF
-      File.open("#{repo}/#{HOOK_FILE}", 'w') do |file|
-        file.write(hook)
-      end
     end
 
-    def self.deactivate(repo)
-      hook_path = "#{repo}/#{HOOK_FILE}"
-      File.delete(hook_path) if File.exists?(hook_path)
-    end
+    def activate
+      hook_args = []
+      hook_args << "-n #{namespace}" if namespace
+      hook_args << "-b #{branch}" if branch
+      hook_args << args if args
 
-    def self.hook(command, args)
-      if (command == 'activate')
-        activate(args)
-      else
-        deactivate(args[:configs])
+      File.open(hook_file, 'w') do |file|
+        file.write(content(hook_args.join(' ')))
       end
     end
+
+    def deactivate
+      File.delete(hook_file) if File.exist?(hook_file)
+    end
   end
 end

data/lib/modulesync/renderer.rb

@@ -3,9 +3,8 @@ require 'find'
 
 module ModuleSync
   module Renderer
-
     class ForgeModuleFile
-      def initialize(configs= {})
+      def initialize(configs = {})
         @configs = configs
       end
     end
@@ -18,24 +17,19 @@ module ModuleSync
     end
 
     def self.remove(file)
-      if File.exists?(file)
-        File.delete(file)
-      end
+      File.delete(file) if File.exist?(file)
     end
 
-    def self.render(template, configs = {})
-      ForgeModuleFile.new(configs).render()
+    def self.render(_template, configs = {})
+      ForgeModuleFile.new(configs).render
     end
 
     def self.sync(template, to_file)
       path = to_file.rpartition('/').first
-      if(! path.empty?)
-        FileUtils.mkdir_p(path)
-      end
+      FileUtils.mkdir_p(path) unless path.empty?
       File.open(to_file, 'w') do |file|
         file.write(template)
       end
     end
-
   end
 end

data/lib/modulesync/settings.rb

@@ -0,0 +1,41 @@
+
+module ModuleSync
+  # Encapsulate a configs for a module, providing easy access to its parts
+  class Settings
+    attr_reader :global_defaults, :defaults, :module_defaults, :module_configs, :additional_settings
+
+    def initialize(global_defaults, defaults, module_defaults, module_configs, additional_settings)
+      @global_defaults = global_defaults
+      @defaults = defaults
+      @module_defaults = module_defaults
+      @module_configs = module_configs
+      @additional_settings = additional_settings
+    end
+
+    def build_file_configs(filename)
+      global_defaults.merge(defaults[filename] || {}).merge(module_defaults).merge(module_configs[filename] || {}).merge(additional_settings)
+    end
+
+    def managed?(filename)
+      Pathname.new(filename).ascend do |v|
+        configs = build_file_configs(v.to_s)
+        return false if configs['unmanaged']
+      end
+      true
+    end
+
+    # given a list of existing files in the repo, return everything that we might want to act on
+    def managed_files(file_list)
+      (file_list | defaults.keys | module_configs.keys).select do |f|
+        (f != ModuleSync::GLOBAL_DEFAULTS_KEY) && managed?(f)
+      end
+    end
+
+    # returns a list of files that should not be touched
+    def unmanaged_files(file_list)
+      (file_list | defaults.keys | module_configs.keys).select do |f|
+        (f != ModuleSync::GLOBAL_DEFAULTS_KEY) && !managed?(f)
+      end
+    end
+  end
+end

data/lib/modulesync/util.rb

@@ -2,6 +2,9 @@ require 'yaml'
 
 module ModuleSync
   module Util
+    def self.symbolize_keys(hash)
+      hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
+    end
 
     def self.parse_config(config_file)
       if File.exist?(config_file)
@@ -13,12 +16,3 @@ module ModuleSync
     end
   end
 end
-
-class Hash
-  #take keys of hash and transform those to a symbols
-  def self.transform_keys_to_symbols(value)
-    return value if not value.is_a?(Hash)
-    hash = value.inject({}){|memo,(k,v)| memo[k.to_sym] = Hash.transform_keys_to_symbols(v); memo}
-    return hash
-  end
-end

data/modulesync.gemspec

@@ -4,23 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'modulesync'
-  spec.version       = '0.6.1'
-  spec.authors       = ['Colleen Murphy']
-  spec.email         = ['colleen@puppetlabs.com']
-  spec.summary       = %q{Puppet Module Synchronizer}
-  spec.description   = %q{Utility to synchronize common files across puppet modules in Github.}
-  spec.homepage      = "http://github.com/puppetlabs/modulesync"
-  spec.license       = "Apache 2"
+  spec.version       = '0.7.2'
+  spec.authors       = ['Vox Pupuli']
+  spec.email         = ['voxpupuli@groups.io']
+  spec.summary       = 'Puppet Module Synchronizer'
+  spec.description   = 'Utility to synchronize common files across puppet modules in Github.'
+  spec.homepage      = 'http://github.com/voxpupuli/modulesync'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "aruba"
+  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 
   spec.add_runtime_dependency 'git', '~>1.2'
   spec.add_runtime_dependency 'puppet-blacksmith', '~>3.0'
+  spec.add_runtime_dependency 'thor'
 end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'modulesync'

data/spec/unit/modulesync/settings_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe ModuleSync::Settings do
+  subject do
+    ModuleSync::Settings.new(
+      {},
+      {},
+      {},
+      { 'Rakefile' => { 'unmanaged' => true },
+        :global => { 'global' => 'value' },
+        'Gemfile' => { 'key' => 'value' }, },
+      {}
+    )
+  end
+
+  it { is_expected.not_to eq nil }
+  it { expect(subject.managed?('Rakefile')).to eq false }
+  it { expect(subject.managed?('Rakefile/foo')).to eq false }
+  it { expect(subject.managed?('Gemfile')).to eq true }
+  it { expect(subject.managed?('Gemfile/foo')).to eq true }
+  it { expect(subject.managed_files([])).to eq ['Gemfile'] }
+  it { expect(subject.managed_files(%w(Rakefile Gemfile other_file))).to eq %w(Gemfile other_file) }
+  it { expect(subject.unmanaged_files([])).to eq ['Rakefile'] }
+  it { expect(subject.unmanaged_files(%w(Rakefile Gemfile other_file))).to eq ['Rakefile'] }
+end

metadata

@@ -1,106 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
-- Colleen Murphy
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility to synchronize common files across puppet modules in Github.
 email:
-- colleen@puppetlabs.com
+- voxpupuli@groups.io
 executables:
 - msync
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -108,6 +142,9 @@ files:
 - Rakefile
 - bin/msync
 - contrib/openstack-commit-msg-hook.sh
+- features/cli.feature
+- features/hook.feature
+- features/step_definitions/git_steps.rb
 - features/support/env.rb
 - features/update.feature
 - lib/modulesync.rb
@@ -116,33 +153,40 @@ files:
 - lib/modulesync/git.rb
 - lib/modulesync/hook.rb
 - lib/modulesync/renderer.rb
+- lib/modulesync/settings.rb
 - lib/modulesync/util.rb
 - modulesync.gemspec
-homepage: http://github.com/puppetlabs/modulesync
+- spec/spec_helper.rb
+- spec/unit/modulesync/settings_spec.rb
+homepage: http://github.com/voxpupuli/modulesync
 licenses:
-- Apache 2
+- Apache-2.0
+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: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet Module Synchronizer
 test_files:
+- features/cli.feature
+- features/hook.feature
+- features/step_definitions/git_steps.rb
 - features/support/env.rb
 - features/update.feature
+- spec/spec_helper.rb
+- spec/unit/modulesync/settings_spec.rb