gitenv 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ffb4ea926396af97597fa7f0e6ea09087b3bfc41
-  data.tar.gz: 274f1ee44491aba02c54489064a48cd625afdf14
+SHA256:
+  metadata.gz: 066334c209061edcd32f246eea29be949b62329779fb600b741546c6b033a3d0
+  data.tar.gz: 64e0c52f52bcc698762175fd3397854d4c42dfedf44f19f958a9eb77ca59cd70
 SHA512:
-  metadata.gz: 5311998ee8af20192519240910810029922e05462f768db0789307e24f7e782d78babfcdd067da0933a557fed9818637f44a4e682d8eb8c2af4ca00ebc3137e8
-  data.tar.gz: 3c2cd2803a321b384ecff57dcba7d41807d511a03c5aef95513fa5d9cb203be5237ba7408f00ee8a67f9eb32987c1551234cf109f3af57dedd2bef7b6a22330b
+  metadata.gz: 83feb9539ad0ae87f1e69dae0af1a97a15f1e1e79104dd521f8a8302ff657c62a13a571dd4d0c2b2ea0095d4f1253d4beb920d7c38505d53ce3e6d6c9ca2f923
+  data.tar.gz: fb87187285ae1614d3ba05035ac1459aa602e0b434929df379f4ae790bcde507d9c29aa064b6c77af1a812876c0537cd33c8cef06308be9eb7152d25c8240c0f

data/Gemfile

@@ -1,19 +1,19 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org"
 
-gem 'paint', '~> 0.9.0'
-gem 'commander', '~> 4.2'
+gem 'paint', '~> 2.2'
+gem 'commander', '~> 4.6'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rake', '~> 10.4'
-  gem 'rspec', '~> 3.1'
-  gem 'rspec-its', '~> 1.1'
-  gem 'fakefs', '~> 0.6.3', :require => 'fakefs/safe'
+  gem 'rake', '~> 13.0'
   gem 'jeweler', '~> 2.0'
-  gem 'rake-version', '~> 0.4.1'
-  gem 'simplecov', '~> 0.9.1'
+  gem 'rake-version', '~> 1.0'
+end
+
+group :test do
+  gem 'codecov', '~> 0.5.2', require: false
+  gem 'fakefs', '~> 1.3', require: 'fakefs/safe'
+  gem 'rspec', '~> 3.10'
+  gem 'rspec-collection_matchers', '~> 1.2'
+  gem 'rspec-its', '~> 1.1'
+  gem 'simplecov', '~> 0.21.2'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Alpha Hydrae
+Copyright (c) 2011-2021 Simon Oulevay (Alpha Hydrae)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,6 +2,10 @@
 
 Creates symlinks to your configuration files in a git repository (<a href="https://github.com/AlphaHydrae/env">like mine</a>).
 
+[![Gem Version](https://badge.fury.io/rb/gitenv.svg)](http://badge.fury.io/rb/gitenv)
+[![Build](https://github.com/AlphaHydrae/gitenv/actions/workflows/build.yml/badge.svg)](https://github.com/AlphaHydrae/gitenv/actions/workflows/build.yml)
+[![Code Coverage](https://codecov.io/gh/AlphaHydrae/gitenv/branch/master/graph/badge.svg?token=PHYTXEW2MG)](https://codecov.io/gh/AlphaHydrae/gitenv)
+
 Run gitenv without arguments to check the symlink configuration. First-time users will be prompted to enter the path to their environment repository so gitenv can set up its own config file.
 
     #=> gitenv

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.1.0

data/lib/gitenv.rb

@@ -2,7 +2,7 @@
 require 'paint'
 
 module Gitenv
-  VERSION = '0.2.0'
+  VERSION = '1.1.0'
 end
 
 Dir[File.join File.dirname(__FILE__), File.basename(__FILE__, '.*'), '*.rb'].each{ |lib| require lib }

data/lib/gitenv/actions.rb

@@ -3,7 +3,7 @@ module Gitenv
 
   class Action
     attr_reader :options
-    
+
     def initialize context, type, files, options
       @context, @type, @files, @options = context, type, files, options
     end

data/lib/gitenv/actions/copy.rb

@@ -30,14 +30,17 @@ module Gitenv
     def initialize context, file, options = {}
       @context, @file = context, file
       @as, @overwrite, @backup = options[:as], options[:overwrite], options[:backup]
-      @backup = true if @overwrite and !options.key?(:backup)
+      @mkdir = options.fetch :mkdir, true
+      @backup = true if @overwrite && !options.key?(:backup)
     end
 
     def apply
-      backup_exists = File.exists? target_backup
-      FileUtils.mv target, target_backup if @backup and File.exists?(target) and !backup_exists
-      FileUtils.rm target if @overwrite and File.exists?(target) and !backup_exists
-      FileUtils.cp origin, target unless File.exists?(target)
+      # TODO: test with mkdir option set to false
+      FileUtils.mkdir_p File.dirname(target) if @mkdir
+      backup_exists = File.exist? target_backup
+      FileUtils.mv target, target_backup if @backup && File.exist?(target) && !backup_exists
+      FileUtils.rm target if @overwrite && File.exist?(target) && !backup_exists
+      FileUtils.cp origin, target unless File.exist?(target)
     end
 
     def to_s
@@ -45,13 +48,13 @@ module Gitenv
     end
 
     def status
-      if !File.exists?(target)
+      if !File.exist?(target)
         Status.missing "is not set up; apply will create the copy"
-      elsif @overwrite == false or digest(origin) == digest(target)
+      elsif @overwrite == false || digest(origin) == digest(target)
         Status.ok 'ok'
       elsif !@overwrite
         Status.error "already exists; enable overwrite if you want to replace it"
-      elsif @backup and File.exists?(target_backup)
+      elsif @backup && File.exist?(target_backup)
         Status.error "already exists with backup copy"
       else
         backup_notice = if @backup; " backup the file and"; end

data/lib/gitenv/actions/symlink.rb

@@ -10,25 +10,35 @@ module Gitenv
         super context, Symlink, files, options
       end
 
-      def overwrite overwrite = true
+      def overwrite *args
+        options = args.last.kind_of?(Hash) ? args.pop : {}
+        overwrite = args.empty? ? true : args.shift
         @options[:overwrite] = overwrite
+        @options[:backup] = options[:backup] if options.key?(:backup)
         self
       end
 
       def once
         @options[:overwrite] = false
+        @options[:backup] = false
         self
       end
     end
 
     def initialize context, file, options = {}
       @context, @file = context, file
-      @as, @overwrite = options[:as], options[:overwrite]
+      @as, @overwrite, @backup = options[:as], options[:overwrite], options[:backup]
+      @mkdir = options.fetch :mkdir, true
+      @backup = true if @overwrite && !options.key?(:backup)
     end
 
     def apply
-      FileUtils.rm link if @overwrite and File.symlink?(link) # FIXME: only if link points somewhere else
-      File.symlink target, link unless File.symlink?(link) or File.exists?(link)
+      FileUtils.mkdir_p File.dirname(link) if @mkdir
+      backup_exists = File.exist? link_backup
+      FileUtils.mv link, link_backup if @backup && file_or_symlink_exists?(link) && !backup_exists
+      return if File.symlink?(link) && File.readlink(link) == target
+      FileUtils.rm link if @overwrite && file_or_symlink_exists?(link) && !backup_exists # TODO: only if link points somewhere else
+      File.symlink target, link unless File.exist?(link)
     end
 
     def to_s
@@ -36,17 +46,24 @@ module Gitenv
     end
 
     def status
+      backup_notice = if @backup; " backup the file and"; end
       if File.symlink? link
         current_target = File.expand_path File.readlink(link)
-        if @overwrite == false or current_target == target
+        if @overwrite == false || current_target == target
           Status.ok 'ok'
         elsif !@overwrite
           Status.error "exists but points to #{current_target}; enable overwrite if you want to replace it"
+        elsif @backup && File.exist?(link_backup)
+          Status.error "already exists with backup copy"
         else
-          Status.warning "currently points to #{current_target}; apply will overwrite"
+          Status.warning "currently points to #{current_target}; apply will#{backup_notice} overwrite"
+        end
+      elsif File.exist? link
+        if @overwrite
+          Status.warning "exists but is not a symlink; apply will#{backup_notice} overwrite"
+        else
+          Status.error "exists but is not a symlink; apply will ignore"
         end
-      elsif File.exists? link
-        Status.error "exists but is not a symlink; apply will ignore"
       else
         Status.missing "is not set up; apply will create the link"
       end
@@ -56,6 +73,10 @@ module Gitenv
       @link ||= File.join(*[ @context.to, link_name].compact)
     end
 
+    def link_backup
+      @link_backup ||= "#{link}.orig"
+    end
+
     def target
       @target ||= File.join(*[ @context.from, @file ].compact)
     end
@@ -65,5 +86,11 @@ module Gitenv
     def link_name
       @link_name ||= @as || @file
     end
+
+    private
+
+    def file_or_symlink_exists? path
+      File.symlink?(path) || File.exist?(path)
+    end
   end
 end

data/lib/gitenv/config.rb

@@ -47,6 +47,18 @@ module Gitenv
       @context.ignores
     end
 
+    def include other_config_file, optional: false
+      raise "Only absolute paths can be included" unless Pathname.new(other_config_file).absolute?
+      absolute_path = File.expand_path(other_config_file)
+      unless File.exists?(absolute_path)
+        raise "Cannot find file to include #{absolute_path}" unless optional
+        return
+      end
+
+      contents = File.open(absolute_path, 'r').read
+      self.instance_eval contents, absolute_path
+    end
+
     private
 
     def matcher file, options = {}

data/lib/gitenv/context.rb

@@ -6,7 +6,7 @@ module Gitenv
     attr_accessor :ignores
 
     def initialize config, options = {}
-      @config, @from, @ignores = config, options[:from], options[:ignores]
+      @config, @from = config, options[:from]
 
       @to ||= File.expand_path('~')
 

data/lib/gitenv/controller.rb

@@ -16,7 +16,7 @@ module Gitenv
 
       check_config_file!
 
-      if !File.exists?(config_file) and !repository
+      if !File.exist?(config_file) and !repository
         create_config_file!
       end
 
@@ -103,7 +103,7 @@ module Gitenv
 
     def load_config_file!
       file = config_file
-      return unless File.exists? file
+      return unless File.exist? file
       contents = File.open(file, 'r').read
       @config.instance_eval contents, file
     end
@@ -112,7 +112,7 @@ module Gitenv
       problems = []
       @config.actions.each do |a|
         a.each_file do |f|
-          if !File.exists?(f)
+          if !File.exist?(f)
             problems << { :file => f, :msg => "does not exist" }
           #elsif !File.file?(f)
           #  problems << { :file => f, :msg => "is not a file" }
@@ -133,7 +133,7 @@ module Gitenv
 
     def check_config_file!
       file = config_file
-      return if !File.exists?(file)
+      return if !File.exist?(file)
       if !File.file?(file)
         abort "#{file} is not a file. It cannot be used as a configuration file."
       elsif !File.readable?(file)
@@ -150,7 +150,7 @@ module Gitenv
         abort msg
       end
       return if File.directory? @config.from
-      notice = File.exists?(@config.from) ? 'is not a directory' : 'does not exist'
+      notice = File.exist?(@config.from) ? 'is not a directory' : 'does not exist'
       from = if @options.repo
         "--repo #{@options.repo}"
       elsif ENV['GITENV_REPO']

data/lib/gitenv/files/matcher.rb

@@ -1,8 +1,5 @@
-
 module Gitenv
-
   class FilesMatcher
-
     def initialize options = {}
       @options = options
       @ignores = options[:ignores] ? [ options[:ignores] ].flatten : []

data/lib/gitenv/files/one_file.rb

@@ -1,8 +1,5 @@
-
 module Gitenv
-
   class OneFile < FilesMatcher
-
     def initialize file, options = {}
       super options
       @file = file

data/lib/gitenv/repository.rb

@@ -1,10 +1,13 @@
-
 module Gitenv
-
   class Repository
+    attr_reader :path
 
     def initialize path
       @path = path
     end
+
+    def == other
+      other.path == path
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitenv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon Oulevay (Alpha Hydrae)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -16,84 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.0'
 description: Gitenv sets up symlinks to your configuration files in a git repository.
 email: git@alphahydrae.com
 executables:
@@ -185,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Symlink manager for git repositories with configuration files.