git_context 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f44d4e6a5be6cdce919c0c20b0ebd2ae967934cda02a1f9f953ebb069e227c5
-  data.tar.gz: 6e13e1cbf933ab58bfda4a23d29daa8e703c8d50aa941a0442a989ab86c33367
+  metadata.gz: e60bd7daf714b6c070888204e98523dbc07f312dada914f7d0403da772ea46d1
+  data.tar.gz: 1c38f849025ff3387e644a3e9102fda430d73091bfa2897ce932b8693179efdc
 SHA512:
-  metadata.gz: 720928465b76410329dd970e64a5647a213a6e2f20f30e9ecb3d35faabb597bf2b353712f0ab1433d938e0f32481a0167b9941b0a384fa6e6671687e01122ca9
-  data.tar.gz: 9b1b77a297209db5b51534bfae1d9675fbb769757e096ef454855a57238f544213a763e531a74cc3a4d4ca7c30ab3e871764f7be2ace802961e8e91dd2efa9b0
+  metadata.gz: 7a9c5ad38b56f93180a41859d4a32675eed0855ca846b36263a3797f1802cd9b62b6381d5aba6466be8cb15916338167807c5c059a57557699d3bf5c752549fd
+  data.tar.gz: 9757e7d8b562b18e2cb562c39bda171ead91dff5732dec41a15ef157a12255fa2c65ab9a318108043afb00ab69153a28031e55b4174f227acc6f8e8ac8372464

data/.circleci/config.yml

@@ -23,13 +23,24 @@ jobs:
       - ruby/rspec-test
   rubocop:
     docker:
-      - image: cimg/ruby:2.6
+      - image: cimg/ruby:2.7.2
     executor: ruby/default
     steps:
       - checkout
       - ruby/install-deps:
           bundler-version: 2.1.4
       - ruby/rubocop-check
+  features:
+    docker:
+      - image: cimg/ruby:2.7.2
+    executor: ruby/default
+    steps:
+      - checkout
+      - ruby/install-deps:
+          bundler-version: 2.1.4
+      - run:
+          name: Feature tests
+          command: bundle exec rspec features
 
 workflows:
   build:
@@ -45,3 +56,4 @@ workflows:
           name: "rspec-ruby:2.5"
           ruby-version: "2.5"
       - rubocop
+      - features

data/.gitignore

@@ -6,7 +6,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+/features/tmp/
+
+/*.gem
 
 # rspec failure tracking
 .rspec_status
 /.idea/
+tags

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.6
+ruby 2.7.3

data/Gemfile

@@ -11,6 +11,7 @@ group :development do
 end
 
 group :development, :test do
+  gem 'aruba', '~> 1.1.0'
   gem 'rake', '~> 12.0'
   gem 'rspec', '~> 3.0'
   gem 'rspec_junit_formatter'

data/Gemfile.lock

@@ -7,11 +7,59 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    aruba (1.1.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (~> 0.16.0)
+      cucumber (>= 2.4, < 7.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
     ast (2.4.1)
+    builder (3.2.4)
+    childprocess (4.0.0)
     codecov (0.2.10)
       json
       simplecov
     coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    contracts (0.16.1)
+    cucumber (6.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 9.0, >= 9.0.0)
+      cucumber-create-meta (~> 4.0, >= 4.0.0)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-html-formatter (~> 13.0, >= 13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-wire (~> 5.0, >= 5.0.0)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (9.0.0)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (4.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.1)
+    cucumber-gherkin (18.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-html-formatter (13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-messages (15.0.0)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (5.0.0)
+      cucumber-core (~> 9.0, >= 9.0.0)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
     ffi (1.13.1)
@@ -30,6 +78,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     json (2.3.1)
     lefthook (0.7.2)
     listen (3.2.1)
@@ -37,6 +87,12 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.7)
     method_source (1.0.0)
+    middleware (0.1.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0225)
+    minitest (5.14.4)
+    multi_test (0.1.2)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -46,6 +102,11 @@ GEM
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -88,7 +149,10 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     thor (1.0.1)
+    thread_safe (0.3.6)
     tty-color (0.5.2)
     tty-cursor (0.7.1)
     tty-prompt (0.22.0)
@@ -99,13 +163,17 @@ GEM
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     wisper (2.0.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba (~> 1.1.0)
   codecov
   git_context!
   guard

data/lib/git_context.rb

@@ -4,12 +4,37 @@ require 'git_context/cli'
 require 'git_context/commands'
 require 'git_context/configuration'
 require 'git_context/interaction'
+require 'git_context/storage'
 require 'git_context/version'
 
 module GitContext
+  GITCONFIG_FILE = '.gitconfig'
+  BASE_STORAGE_DIR = '.gitcontext'
+  CONFIG_FILE = 'config.yml'
+  PROFILES_DIR = 'profiles'
+  CONTEXTS_FILE = 'contexts'
+
   class Error < StandardError; end
 
-  Context = Struct.new(:work_dir, :profile_name)
-  Profile = Struct.new(:profile_name, :user)
+  Context = Struct.new(:work_dir, :profile_name) do
+    def serialize
+      {
+        'work_dir' => work_dir,
+        'profile_name' => profile_name
+      }
+    end
+  end
+
+  Profile = Struct.new(:profile_name, :user) do
+    def serialize
+      {
+        'profile_name' => profile_name,
+        'name' => user.name,
+        'email' => user.email,
+        'signing_key' => user.signing_key
+      }
+    end
+  end
+
   User = Struct.new(:name, :email, :signing_key)
 end

data/lib/git_context/cli.rb

@@ -7,6 +7,7 @@ module GitContext
       setup: 'Setup',
       create_profile: 'CreateProfile',
       create_context: 'CreateContext',
+      delete_profile: 'DeleteProfile',
       list_profile: 'ListProfile'
     }.freeze
 

data/lib/git_context/commands.rb

@@ -3,6 +3,7 @@
 require 'git_context/commands/base'
 require 'git_context/commands/create_context'
 require 'git_context/commands/create_profile'
+require 'git_context/commands/delete_profile'
 require 'git_context/commands/list_profile'
 require 'git_context/commands/help'
 require 'git_context/commands/setup'

data/lib/git_context/commands/delete_profile.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module GitContext
+  module Commands
+    class DeleteProfile < Base
+      def call
+        stored_profiles = @configuration.list_profile_names
+        to_be_deleted = @interaction.prompt_delete_profile(stored_profiles)
+        @configuration.delete_profile(to_be_deleted)
+      end
+    end
+  end
+end

data/lib/git_context/commands/help.rb

@@ -8,6 +8,7 @@ module GitContext
         git-context setup # initialize git-context in your home directory
         git-context create_profile # create a new profile to be used in gitconfig
         git-context create_context # create a new context to use a profile in git repositories within a directory
+        git-context delete_profile # delete a stored git-context profile
         git-context list_profile # list stored git-context profiles
       USAGE
 

data/lib/git_context/commands/setup.rb

@@ -5,7 +5,7 @@ module GitContext
     class Setup < Base
       def call
         @configuration.setup
-        @interaction.info('git_context has been set up in')
+        @interaction.info("git_context has been set up in #{@configuration.home}")
       end
     end
   end

data/lib/git_context/configuration.rb

@@ -1,108 +1,80 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'pathname'
 
 module GitContext
-  class Configuration
-    BASE_STORAGE_DIR = '.gitcontext'
-    PROFILES_DIR = 'profiles'
-    CONTEXTS_FILENAME = 'contexts'
+  class ConfigData
+    attr_reader :home, :profiles, :contexts
 
-    def initialize(home_dir)
-      @home_dir = home_dir
+    def initialize(home)
+      @home = home
+      @profiles = []
+      @contexts = []
     end
 
-    def setup
-      create_base_dir unless exists?(git_context_dir)
-      create_contexts_file
-      create_profiles_dir unless exists?(profiles_dir)
-      include_in_gitconfig
-    end
-
-    def add_profile(profile)
-      profile_file = profile_filepath(profile.profile_name)
-      touch_file(profile_file)
-
-      `git config -f "#{profile_file}" --add user.name "#{profile.user.name}"`
-      `git config -f "#{profile_file}" --add user.email "#{profile.user.email}"`
-      `git config -f "#{profile_file}" --add user.signingKey "#{profile.user.signing_key}"`
-    end
-
-    def list_profile_names
-      Dir.entries(profiles_dir) - %w[. ..]
-    end
-
-    def delete_profile(profile)
-      profile_file = profile_filepath(profile.profile_name)
-      delete_file(profile_file)
-    end
-
-    def add_context(context)
-      profile_file = profile_filepath(context.profile_name)
-
-      `git config -f "#{contexts_filepath}" --add "includeIf.gitdir:#{context.work_dir}/.path" "#{profile_file}"`
-    end
-
-    private
-
-    def profile_filepath(profile_name)
-      profiles_dir.join(profile_name)
+    def serialize
+      {
+        'profiles' => profiles.map(&:serialize),
+        'contexts' => contexts.map(&:serialize)
+      }
     end
+  end
 
-    def create_base_dir
-      FileUtils.mkdir(git_context_dir)
-    end
+  class Configuration
+    attr_reader :home, :config_data, :yaml, :git, :storages
 
-    def create_profiles_dir
-      FileUtils.mkdir(profiles_dir)
-    end
+    def initialize(home)
+      @home = home
+      @config_data = ConfigData.new(@home)
+      @yaml = Storage::YML.new(@config_data)
+      @git = Storage::Git.new(@config_data)
 
-    def profiles_dir
-      git_context_dir.join(PROFILES_DIR)
+      @yaml.load
+      @storages = [@yaml, @git]
     end
 
-    def create_contexts_file
-      touch_file(contexts_filepath)
+    def setup
+      create_base_dir
+      setup_storage
     end
 
-    def contexts_filepath
-      git_context_dir.join(CONTEXTS_FILENAME)
+    def add_profile(profile)
+      config_data.profiles << profile
+      save_into_storage
     end
 
-    def git_context_dir
-      home.join(BASE_STORAGE_DIR)
+    def delete_profile(profile_name)
+      config_data.profiles.delete_if { |profile| profile.profile_name == profile_name }
+      save_into_storage
     end
 
-    def global_gitconfig_path
-      home.join('.gitconfig')
+    def list_profile_names
+      config_data.profiles.map(&:profile_name).sort
     end
 
-    def include_in_gitconfig
-      return if include_path_exists?
+    def add_context(context)
+      config_data.contexts << context
+      config_data.contexts.sort_by!(&:work_dir)
 
-      `git config -f "#{global_gitconfig_path}" --add "include.path" "#{contexts_filepath}"`
+      save_into_storage
     end
 
-    def include_path_exists?
-      include_path = `git config -f "#{global_gitconfig_path}" include.path`
-      include_path.include?(contexts_filepath.to_s)
-    end
+    private
 
-    def home
-      Pathname.new(@home_dir)
+    def setup_storage
+      storages.each(&:setup)
     end
 
-    def touch_file(config_file_path)
-      FileUtils.touch(config_file_path)
+    def save_into_storage
+      storages.each(&:save)
     end
 
-    def delete_file(config_file_path)
-      FileUtils.rm(config_file_path)
+    def create_base_dir
+      FileUtils.mkdir(git_context_dir) unless FileTest.exists?(git_context_dir)
     end
 
-    def exists?(dir_or_file)
-      FileTest.exists?(dir_or_file)
+    def git_context_dir
+      File.join(home, BASE_STORAGE_DIR)
     end
   end
 end

data/lib/git_context/interaction.rb

@@ -28,6 +28,10 @@ module GitContext
       end
     end
 
+    def prompt_delete_profile(saved_profiles)
+      @prompt.select('Please select profile to be deleted:', saved_profiles, cycle: true)
+    end
+
     def show(message)
       @prompt.say(message)
     end

data/lib/git_context/storage.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'git_context/storage/git'
+require 'git_context/storage/yml'
+
+module GitContext
+  module Storage
+  end
+end

data/lib/git_context/storage/git.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module GitContext
+  module Storage
+    class Git
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
+      end
+
+      def setup
+        create_contexts_file
+        create_profiles_dir
+
+        include(global_gitconfig_path, contexts_filepath)
+      end
+
+      def reset
+        FileUtils.rm(contexts_filepath)
+        FileUtils.rm_r(profiles_dir)
+
+        create_contexts_file
+        create_profiles_dir
+      end
+
+      def save
+        reset
+        save_profiles
+        save_contexts
+      end
+
+      private
+
+      def save_contexts
+        config.contexts.each do |context|
+          profile_file = profile_filepath(context.profile_name)
+
+          add_context(contexts_filepath, context.work_dir, profile_file)
+        end
+      end
+
+      def save_profiles
+        config.profiles.each do |profile|
+          profile_file = profile_filepath(profile.profile_name)
+          touch_file(profile_file)
+
+          add_profile(profile_file, profile)
+        end
+      end
+
+      def include(gitconfig_path, contexts_filepath)
+        return if included?(gitconfig_path, contexts_filepath)
+
+        `git config -f "#{gitconfig_path}" --add "include.path" "#{contexts_filepath}"`
+      end
+
+      def add_profile(profile_file, profile)
+        `git config -f "#{profile_file}" --add user.name "#{profile.user.name}"`
+        `git config -f "#{profile_file}" --add user.email "#{profile.user.email}"`
+        `git config -f "#{profile_file}" --add user.signingKey "#{profile.user.signing_key}"`
+      end
+
+      def add_context(contexts_file, dir, profile_file)
+        `git config -f "#{contexts_file}" --add "includeIf.gitdir:#{dir}/.path" "#{profile_file}"`
+      end
+
+      def included?(gitconfig_path, contexts_filepath)
+        include_path = `git config -f "#{gitconfig_path}" include.path`
+        include_path.include?(contexts_filepath)
+      end
+
+      def home
+        config.home
+      end
+
+      def create_contexts_file
+        touch_file(contexts_filepath)
+      end
+
+      def create_profiles_dir
+        create_dir(profiles_dir)
+      end
+
+      def global_gitconfig_path
+        File.join(home, GITCONFIG_FILE)
+      end
+
+      def contexts_filepath
+        File.join(git_context_dir, CONTEXTS_FILE)
+      end
+
+      def git_context_dir
+        File.join(home, BASE_STORAGE_DIR)
+      end
+
+      def profiles_dir
+        File.join(git_context_dir, PROFILES_DIR)
+      end
+
+      def profile_filepath(profile_name)
+        File.join(profiles_dir, profile_name)
+      end
+
+      def touch_file(config_file_path)
+        FileUtils.touch(config_file_path)
+      end
+
+      def create_dir(dir)
+        FileUtils.mkdir(dir) unless FileTest.exists?(dir)
+      end
+    end
+  end
+end

data/lib/git_context/storage/yml.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module GitContext
+  module Storage
+    class YML
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
+      end
+
+      def setup
+        return if FileTest.exist?(config_filepath)
+
+        FileUtils.touch(config_filepath)
+      end
+
+      def load
+        return unless config_filepath && FileTest.exist?(config_filepath)
+
+        load_profiles_from_file
+        load_contexts_from_file
+      end
+
+      def save
+        File.open(config_filepath, 'w') do |file|
+          file.write(YAML.dump(serialized_data))
+        end
+      end
+
+      private
+
+      def load_profiles_from_file
+        content['profiles']&.each do |profile|
+          user = User.new(profile['name'], profile['email'], profile['signing_key'])
+          config.profiles << Profile.new(profile['profile_name'], user)
+        end
+      end
+
+      def load_contexts_from_file
+        content['contexts']&.each do |context|
+          config.contexts << Context.new(context['work_dir'], context['profile_name'])
+        end
+      end
+
+      def content
+        @content ||= YAML.load_file(config_filepath) || {}
+      end
+
+      def serialized_data
+        config.serialize
+      end
+
+      def config_filepath
+        File.join(git_context_dir, CONFIG_FILE)
+      end
+
+      def git_context_dir
+        File.join(config.home, BASE_STORAGE_DIR)
+      end
+    end
+  end
+end

data/lib/git_context/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitContext
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_context
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Albert Salim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -55,11 +55,15 @@ files:
 - lib/git_context/commands/base.rb
 - lib/git_context/commands/create_context.rb
 - lib/git_context/commands/create_profile.rb
+- lib/git_context/commands/delete_profile.rb
 - lib/git_context/commands/help.rb
 - lib/git_context/commands/list_profile.rb
 - lib/git_context/commands/setup.rb
 - lib/git_context/configuration.rb
 - lib/git_context/interaction.rb
+- lib/git_context/storage.rb
+- lib/git_context/storage/git.rb
+- lib/git_context/storage/yml.rb
 - lib/git_context/version.rb
 homepage: https://github.com/caalberts/git_context
 licenses:
@@ -82,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: "`git-context` provides a tool to manage conditional git config."