modulesync 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80eb0fc8d80ef1b1c2ca334b6a3897b2ac43f7a6
-  data.tar.gz: 64fdbe9a7c894d5cd284ac3c7431ccf78e12fb86
+  metadata.gz: 38b2eb4843e2a132da91b2bde013d8d648e6c007
+  data.tar.gz: 3d54efb0292a807e4f2b556662025884a855c4da
 SHA512:
-  metadata.gz: 647516b662a2f16f9d728ef071713d9cecdbc96fc031635ff80b863898f448f1de190d953584c1d1146445cd2da0127f8a1fca25808d2ea10cf831a7a34b32dd
-  data.tar.gz: d5448a82187ad533acc6bdbb3f9c4487211830c73350ce30c01e8e03dda69586c4e7f7443007e76ed40436371e03412b401c833f39fdfe5da1ba752980340243
+  metadata.gz: 7cb07104d0f07b006cde792d4b73d31a23f4a1c88024887bddb6f4e5408b9d99243665f99ba4beae40037c16b63a3f735a78138a8e424f75ad822684f225f527
+  data.tar.gz: 3aabccaa9cd274721fdefdea44b40ccf6a3acda3cb8ad603a16d3dc366df4c5596b45f565e25719c36b6ecfb0c287911e68b44026a81d16e20b6cb7346fc3d48

data/.gitignore

@@ -1,2 +1,3 @@
 modules/
 *.gem
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+##2014-9-29 - 0.1.0
+
+### Summary
+
+This release adds support for other SSH-based git servers, which means
+gitlab is now supported.

data/Gemfile

@@ -1,3 +1,3 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'git'
+gemspec

data/lib/modulesync.rb

@@ -54,7 +54,7 @@ module ModuleSync
 
       managed_modules.each do |puppet_module|
         puts "Syncing #{puppet_module}"
-        Git.pull(options[:namespace], puppet_module)
+        Git.pull(options[:git_user], options[:git_provider_address], options[:namespace], puppet_module)
         module_configs = Util.parse_config("#{PROJ_ROOT}/#{puppet_module}/#{MODULE_CONF_FILE}")
         files_to_manage = module_files | defaults.keys | module_configs.keys
         files_to_delete = []

data/lib/modulesync/cli.rb

@@ -10,6 +10,8 @@ module ModuleSync
       {
         :namespace            => 'puppetlabs',
         :branch               => 'master',
+        :git_user             => 'git',
+        :git_provider_address => 'github.com',
         :managed_modules_conf => 'managed_modules.yml',
         :configs              => '.',
       }

data/lib/modulesync/constants.rb

@@ -5,7 +5,6 @@ module ModuleSync
     MODULE_CONF_FILE     = '.sync.yml'
     MODULESYNC_CONF_FILE = 'modulesync.yml'
     PROJ_ROOT            = './modules'
-    ENDPOINT             = 'git@github.com'
     HOOK_FILE            = '.git/hooks/pre-push'
   end
 end

data/lib/modulesync/git.rb

@@ -4,7 +4,7 @@ module ModuleSync
   module Git
     include Constants
 
-    def self.pull(org, name)
+    def self.pull(git_user, git_provider_address, org, name)
       if ! Dir.exists?(PROJ_ROOT)
         Dir.mkdir(PROJ_ROOT)
       end
@@ -12,8 +12,9 @@ module ModuleSync
       # Repo needs to be cloned in the cwd
       if ! Dir.exists?("#{PROJ_ROOT}/#{name}") || ! Dir.exists?("#{PROJ_ROOT}/#{name}/.git")
         puts "Cloning repository fresh"
-        remote = "#{ENDPOINT}:#{org}/#{name}.git"
+        remote = "#{git_user}@#{git_provider_address}:#{org}/#{name}.git"
         local = "#{PROJ_ROOT}/#{name}"
+        puts "Cloning from #{remote}"
         repo = ::Git.clone(remote, local)
 
       # Repo already cloned, check out master and override local changes

data/lib/modulesync/util.rb

@@ -7,6 +7,7 @@ module ModuleSync
       if File.exist?(config_file)
         YAML.load_file(config_file) || {}
       else
+        puts "No config file under #{config_file} found, using default values"
         {}
       end
     end

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.0.3'
+  spec.version       = '0.1.0'
   spec.authors       = ['Colleen Murphy']
   spec.email         = ['colleen@puppetlabs.com']
   spec.summary       = %q{Puppet Module Synchronizer}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Colleen Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,8 +47,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - bin/msync

data/Gemfile.lock

@@ -1,10 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    git (1.2.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  git