dotter_dotfiles 0.2.0 → 0.3.0

data/lib/dotter/foreigngitrepo.rb

@@ -0,0 +1,29 @@
+require 'git'
+require 'dotter/utilities'
+module Dotter
+  class ForeignGitRepo < GitRepo
+    def initialize(package, init = false, source_repository = '')
+      @package = package
+      @project_path = package_path(package)
+      @origin = source_repository
+      unless init
+        open
+      else
+        self.init(source_repository)
+      end
+    end
+
+    def init(source_url)
+      @repo = Git.clone(source_url, @project_path.to_s)
+    end
+
+    def open
+      @repo = Git.open(@project_path)
+      @log = @repo.log
+    end
+
+    def update
+      @repo.pull
+    end
+  end
+end

data/lib/dotter/gitrepo.rb

@@ -1,43 +1,52 @@
 require 'git'
 module Dotter
-	require 'dotter/utilities'
-	class GitRepo
-		include Utilities
-		def initialize(package,init=false)
-			@package = package
-			@project_path = package_path(package)
-			@metadata_path = repo_path(package)
-			@metadata_indexes_path = index_path(package)
-			unless init
-				self.open()
-			else
-				self.init()
-			end
-		end
-		def open()
-			@repo = Git.open(@project_path.to_s,  { :repository => @metadata_path.to_s, :index => @metadata_indexes_path.to_s})
-			@log = @repo.log
-		end
-		def init()
-			@repo = Git.init(@project_path.to_s,  { :repository => @metadata_path.to_s, :index => @metadata_indexes_path.to_s})
-		end
-		attr_reader :repo
-		attr_reader :project_path
-		attr_reader :package
-		attr_reader :metadata_path
-		attr_reader :metadata_indexes_path
-		attr_reader :log
-		def add(file)
-			@repo.add(file)
-		end
-		def reset()
-			@repo.reset()
-		end
-		def commit_all(commit_message)
-			@repo.commit_all(commit_message)
-		end
-		def commit(commit_message)
-			@repo.commit(commit_message)
-		end
-	end
+  require 'dotter/utilities'
+  class GitRepo
+    include Utilities
+    def initialize(package, init = false, bare = false)
+      @package = package
+      @project_path = package_path(package)
+      @metadata_path = repo_path(package)
+      @metadata_indexes_path = index_path(package)
+      unless init
+        open
+      else
+        self.init(bare)
+      end
+    end
+
+    def open
+      @repo = Git.open(@project_path.to_s, repository: @metadata_path.to_s, index: @metadata_indexes_path.to_s)
+      @log = @repo.log
+    end
+
+    def init(bare = false)
+      unless bare
+        @repo = Git.init(@project_path.to_s, repository: @metadata_path.to_s, index: @metadata_indexes_path.to_s)
+      else
+        @repo = Git.init(@project_path.to_s, repository: @metadata_path.to_s, index: @metadata_indexes_path.to_s, bare: true)
+      end
+    end
+    attr_reader :repo
+    attr_reader :project_path
+    attr_reader :package
+    attr_reader :metadata_path
+    attr_reader :metadata_indexes_path
+    attr_reader :log
+    def add(file)
+      @repo.add(file)
+    end
+
+    def reset
+      @repo.reset
+    end
+
+    def commit_all(commit_message)
+      @repo.commit_all(commit_message)
+    end
+
+    def commit(commit_message)
+      @repo.commit(commit_message)
+    end
+  end
 end

data/lib/dotter/package.rb

@@ -1,60 +1,81 @@
 require 'dotter/utilities'
 require 'dotter/configuration'
 require 'dotter/gitrepo'
+require 'dotter/foreigngitrepo'
 module Dotter
-	class Package
-		include Utilities
-		def initialize(name)
-			@name = name
-			@config = Configuration.new
-			@our_config = @config.package_config(@name)
-			if self.tracked?
-				@repo = GitRepo.new(name)
-			end
-		end
-		def stow
-			go_to_dotfiles
-			returned_output =  `stow -v #{@name}`
-			@config.set_state(@name, 'stowed')
-			returned_output
-		end
-		def unstow
-			go_to_dotfiles
-			returned_output =  `stow -Dv #{@name}`
-			@config.set_state(@name, 'unstowed')
-			returned_output
-		end
-		def track
-			@repo = GitRepo.new(@name,true)
-			@config.track(@name)
-		end
-		def update
-			go_to_dotfiles
-			returned_output = `stow -Rv #{@name}`
-		end
-		def stowed?
-			@our_config['state'] == 'stowed'
-		end
-		def unstowed?
-			!self.stowed?
-		end
-		def tracked?
-			@our_config['tracked']
-		end
-		def untracked?
-			!self.tracked?
-		end
-		def to_s
-			@name
-		end
-		def public?
-			@our_config['public'] = true
-		end
-		def private?
-			!self.public?
-		end
-		attr_reader :name
-		attr_accessor :config
-		attr_reader :repo
-	end
+  class Package
+    include Utilities
+    def initialize(name)
+      @name = name
+      @config = Configuration.new
+      @our_config = @config.package_config(@name)
+      if self.tracked?
+        unless self.foreign?
+          @repo = GitRepo.new(name)
+        else
+          @repo = ForeignGitRepo.new(name)
+        end
+      end
+    end
+
+    def stow
+      go_to_dotfiles
+      returned_output = `stow -v #{@name}`
+      @config.set_state(@name, 'stowed')
+      returned_output
+    end
+
+    def unstow
+      go_to_dotfiles
+      returned_output = `stow -Dv #{@name}`
+      @config.set_state(@name, 'unstowed')
+      returned_output
+    end
+
+    def track
+      @repo = GitRepo.new(@name, true)
+      @config.track(@name)
+    end
+
+    def update
+      go_to_dotfiles
+      @repo.update if self.foreign?
+      returned_output = `stow -Rv #{@name}`
+    end
+
+    def stowed?
+      @our_config['state'] == 'stowed'
+    end
+
+    def unstowed?
+      !self.stowed?
+    end
+
+    def tracked?
+      @our_config['tracked']
+    end
+
+    def untracked?
+      !self.tracked?
+    end
+
+    def foreign?
+      @our_config['type'] == 'git_repo'
+    end
+
+    def to_s
+      @name
+    end
+
+    def public?
+      @our_config['public'] == true
+    end
+
+    def private?
+      !self.public?
+    end
+    attr_reader :name
+    attr_accessor :config
+    attr_reader :repo
+  end
 end

data/lib/dotter/publicgitrepo.rb

@@ -2,41 +2,46 @@ require 'git'
 require 'dotter/utilities'
 require 'dotter/gitrepo'
 module Dotter
-	class PublicGitRepo
-		include Utilities
-		def initialize(init=false)
-			@project_path = package_path('public')
-			unless init
-				self.open()
-			else
-				self.init()
-			end
-		end
-		def open
-			@repo = Git.open(@project_path.to_s)
-		end
-		def init
-			@repo = Git.init(@project_path.to_s)
-		end
-		def add_package(package)
-			Dir.chdir(@project_path)
-			packagerepo = GitRepo.new(package)
-			package_repo = packagerepo.repo
-			@repo.add_remote(package.to_s, package_repo)
-			subtree_output = `git subtree add --prefix #{package.to_s} #{package.to_s} master`
-			conf = Configuration.new
-			conf.publish(package)
-			subtree_output
-		end
-		def remove_package(package)
-			Dir.chdir(@project_path)
-			# This was broken with ruby-git. Someone else should check.
-			`git remote remove #{package}`
-			FileUtils.remove_dir(package)
-			@repo.commit_all('Removed package #{package}')
-			conf = Configuration.new
-			conf.unpublish(package)
-		end
-		attr_reader :repo
-	end
+  class PublicGitRepo
+    include Utilities
+    def initialize(init = false)
+      @project_path = package_path('public')
+      unless init
+        open
+      else
+        self.init
+      end
+    end
+
+    def open
+      @repo = Git.open(@project_path.to_s)
+    end
+
+    def init
+      @repo = Git.init(@project_path.to_s)
+    end
+
+    def add_package(package)
+      Dir.chdir(@project_path)
+      other_package = Package.new(package)
+      packagerepo = other_package.repo
+      package_repo = packagerepo.repo
+      @repo.add_remote(package.to_s, package_repo)
+      subtree_output = `git subtree add --prefix #{package.to_s} #{package.to_s} master`
+      conf = Configuration.new
+      conf.publish(package)
+      subtree_output
+    end
+
+    def remove_package(package)
+      Dir.chdir(@project_path)
+      # This was broken with ruby-git. Someone else should check.
+      `git remote remove #{package}`
+      FileUtils.remove_dir(package)
+      @repo.commit_all('Removed package #{package}')
+      conf = Configuration.new
+      conf.unpublish(package)
+    end
+    attr_reader :repo
+  end
 end

data/lib/dotter/utilities.rb

@@ -1,34 +1,40 @@
- require 'pathname'
- module Dotter
-	 module Utilities
-		@@dotfiles_path = Pathname(File.expand_path('~/dotfiles')) 
-		def dotfiles_path
-			@@dotfiles_path
-		end
-		def go_to_dotfiles()
-			Dir.chdir(@@dotfiles_path)
-		end
-		def package_path(package)
-			@@dotfiles_path + package
-		end
-		@@dotter_path = @@dotfiles_path + 'dotter'
-		def dotter_path
-			@@dotter_path
-		end
-		def repo_path(package)
-			@@dotter_path + '.dotter/gitrepos/' + package 
-		end
-		def index_path(package)
-			@@dotter_path + '.dotter/indexes/' + package
-		end
-		def all_package_names
-			directory = Pathname.new(@@dotfiles_path)
-			directories = directory.children.select { |c| c.directory? }
-			package_names = []
-			directories.each do |directory| 
-				package_names.push(directory.basename)
-			end
-			package_names
-		end
-	 end
+require 'pathname'
+module Dotter
+  module Utilities
+    @@dotfiles_path = Pathname(File.expand_path('~/dotfiles'))
+    def dotfiles_path
+      @@dotfiles_path
+    end
+
+    def go_to_dotfiles
+      Dir.chdir(@@dotfiles_path)
+    end
+
+    def package_path(package)
+      @@dotfiles_path + package
+    end
+    @@dotter_path = @@dotfiles_path + 'dotter'
+    @@public_repo_path = @@dotfiles_path + 'public'
+    def dotter_path
+      @@dotter_path
+    end
+
+    def repo_path(package)
+      @@dotter_path + '.dotter/gitrepos/' + package
+    end
+
+    def index_path(package)
+      @@dotter_path + '.dotter/indexes/' + package
+    end
+
+    def all_package_names
+      directory = Pathname.new(@@dotfiles_path)
+      directories = directory.children.select(&:directory?)
+      package_names = []
+      directories.each do |directory|
+        package_names.push(directory.basename)
+      end
+      package_names
+    end
+   end
 end

data/lib/dotter/version.rb

@@ -1,4 +1,4 @@
 module Dotter
   # dotter version
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotter_dotfiles
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Hodgkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,9 +129,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".document"
 - ".gitignore"
 - ".rdoc_options"
+- ".rubocop.yml"
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
@@ -142,6 +144,7 @@ files:
 - lib/dotter.rb
 - lib/dotter/cli.rb
 - lib/dotter/configuration.rb
+- lib/dotter/foreigngitrepo.rb
 - lib/dotter/gitrepo.rb
 - lib/dotter/package.rb
 - lib/dotter/publicgitrepo.rb