nanoc-git 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e84ad92170f71d52fb4ad0a98e3be6b075706dc
-  data.tar.gz: 48d0403491724f939178a871c5b9fc7346ee75a6
+  metadata.gz: 06c0f31b6ffd0812cde9d6204d47acc97a557820
+  data.tar.gz: 68b149ebe8ff2b6ab0d50cde9da0e96bc856ae54
 SHA512:
-  metadata.gz: a07182b56c302214ef12b41e438e2bdf85ca60c09ee8207a9ca9efc204b86265d07cccb821e7f016208a73bd158f1a39d6abde1b4678a2e23ba980fbfd6a39bd
-  data.tar.gz: 779ed08b2cd185eb4201a8f78968f4a1ff9852efd19a8cb1694da48be58e6426abb2c1a036bb51705a59396f899b23149bbc115cb4ca26c0f2887579b6526c62
+  metadata.gz: 701556620c5bbfbcef9a769f41a1202e3f1def634a2fc2e18d0f209c5d19827ac62aa91e5733f0ca4f5cc34a0a6657927859c16b2cd6e3871c301cf7e045249e
+  data.tar.gz: e365ea496a01a408823f4d5f0bd89443432db8045deb4e9791112035411d79f72037e4fe0608cf45369cbad3fbe441761a2fa8579aa31cc55c52e31017133a59

data/README.md

@@ -1,35 +1,3 @@
-[![Build Status](https://travis-ci.org/nanoc/nanoc-git.png)](https://travis-ci.org/nanoc/nanoc-git)
-
 # nanoc-git
 
-This provides a Git deployer for [nanoc](http://nanoc.ws).
-
-Maintained by [lifepillar](https://github.com/lifepillar).
-
-## Compatibility
-
-Nanoc 4.0.0 or later.
-
-## Installation
-
-`gem install nanoc-git`
-
-## Usage
-
-Example configuration for the Git deployer:
-
-```yaml
-deploy:
-  default:
-    kind: git
-    remote: git@github.com:myself/myproject.git
-    branch: gh-pages
-    forced: true
-```
-
-The following configuration options are available:
-
-* `remote` (default `origin`): the Git remote to deploy to
-* `branch` (default `master`): the Git branch to deploy
-* `forced` (default `false`): Whether or not to push with `--force`
-
+This repository is obsolete. The Git deployer is now part of Nanoc.

data/nanoc-git.gemspec

@@ -1,29 +1,18 @@
 # encoding: utf-8
 
-$LOAD_PATH.unshift(File.expand_path('../lib/', __FILE__))
-require 'nanoc/git/version'
-
 Gem::Specification.new do |s|
   s.name        = 'nanoc-git'
-  s.version     = Nanoc::Git::VERSION
+  s.version     = '2.0.0'
   s.homepage    = 'http://nanoc.ws/'
-  s.summary     = 'Git deployer for nanoc'
-  s.description = 'Provides a Git deployer for nanoc'
+  s.summary     = '(Obsolete) Git deployer for Nanoc'
+  s.description = 'Provides a Git deployer for Nanoc. Obsolete; merged into Nanoc 4.5.'
 
-  s.author  = 'Lifepillar'
-  s.email   = 'github@lifepillar.org'
+  s.author  = 'Denis Defreyne'
+  s.email   = 'denis@stoneship.orgorg'
   s.license = 'MIT'
 
-  s.required_ruby_version = '>= 2.2.0'
-
-  s.files              = Dir['[A-Z]*'] +
-                         Dir['{lib,test}/**/*'] +
-                         [ 'nanoc-git.gemspec' ]
-  s.require_paths      = [ 'lib' ]
-
-  s.rdoc_options     = [ '--main', 'README.md' ]
-  s.extra_rdoc_files = [ 'LICENSE', 'README.md', 'NEWS.md' ]
+  s.files = Dir['[A-Z]*'] + ['nanoc-git.gemspec']
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency('nanoc', '>= 3.7.0', '< 5.0.0')
-  s.add_development_dependency('bundler', '~> 1.5')
+  s.add_runtime_dependency('nanoc', '~> 4.5')
 end

metadata

@@ -1,86 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-git
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
-- Lifepillar
+- Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '4.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-description: Provides a Git deployer for nanoc
-email: github@lifepillar.org
+        version: '4.5'
+description: Provides a Git deployer for Nanoc. Obsolete; merged into Nanoc 4.5.
+email: denis@stoneship.orgorg
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
-- NEWS.md
+extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- NEWS.md
 - README.md
-- Rakefile
-- lib/nanoc-git.rb
-- lib/nanoc/git.rb
-- lib/nanoc/git/deployer.rb
-- lib/nanoc/git/version.rb
 - nanoc-git.gemspec
-- test/filters/test_git.rb
-- test/helper.rb
 homepage: http://nanoc.ws/
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -88,9 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Git deployer for nanoc
+summary: "(Obsolete) Git deployer for Nanoc"
 test_files: []
-has_rdoc: 

data/Gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'minitest'
-gem 'rake'
-gem 'coveralls', require: false

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nanoc-git (1.0.1)
-      nanoc (>= 3.7.0, < 5.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    colored (1.2)
-    coveralls (0.8.3)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    cri (2.7.0)
-      colored (~> 1.2)
-    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.3)
-    mime-types (2.6.2)
-    minitest (5.8.2)
-    nanoc (4.0.0)
-      cri (~> 2.3)
-    netrc (0.11.0)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.6.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  coveralls
-  minitest
-  nanoc-git!
-  rake
-
-BUNDLED WITH
-   1.10.6

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2015 Denis Defreyne and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/NEWS.md

@@ -1,10 +0,0 @@
-# nanoc-git news
-
-## 1.0.0
-
-Initial release.
-
-## 1.0.1 (2015-11-15)
-
-Added support for Nanoc 4
-

data/Rakefile

@@ -1,10 +0,0 @@
-# encoding: utf-8
-
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs = %w( lib test )
-  t.test_files = FileList['test/**/test_*.rb', 'test/**/*_spec.rb']
-end
-
-task :default => :test

data/lib/nanoc-git.rb

@@ -1,3 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc/git'

data/lib/nanoc/git.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-module Nanoc
-  module Git
-  end
-end
-
-require 'nanoc/git/version'
-require 'nanoc/git/deployer'

data/lib/nanoc/git/deployer.rb

@@ -1,90 +0,0 @@
-# encoding: utf-8
-
-module Nanoc::Git
-  # A deployer that deploys a site using [Git](http://git-scm.com).
-  #
-  # @example A deployment configuration for GitHub Pages:
-  #
-  #   deploy:
-  #     default:
-  #       kind:       git
-  #       remote:     git@github.com:myself/myproject.git
-  #       branch:     gh-pages
-  #       forced:     true
-  #
-  class Deployer < ::Nanoc::Extra::Deployer
-    identifier :git
-
-    # @see Nanoc::Extra::Deployer#run
-    def run
-      unless File.exist?(source_path)
-        raise "#{source_path} does not exist. Please build your site first."
-      end
-
-      remote = config.fetch(:remote, 'origin')
-      branch = config.fetch(:branch, 'master')
-      forced = config.fetch(:forced, false)
-
-      puts "Deploying via git to remote='#{remote}' and branch='#{branch}'"
-
-      Dir.chdir(source_path) do
-        unless File.exist?('.git')
-          puts "#{source_path} does not appear to be a Git repo. Creating one..."
-          run_shell_cmd(%w( git init ))
-        end
-
-        # If the remote is not a URL already, verify that it is defined.
-        # Examples of URLs:
-        #    https://github.com/nanoc/nanoc.git
-        #    git@github.com:lifepillar/nanoc.git
-        unless remote.match(/:\/\/|@.+:/)
-          begin
-            run_shell_cmd(%W( git config --get remote.#{remote}.url ))
-          rescue Nanoc::Extra::Piper::Error
-            raise "Please add a remote called '#{remote}' to the repo inside #{source_path}."
-          end
-        end
-
-        # If the branch exists then switch to it, otherwise prompt the user to create one.
-        begin
-          run_shell_cmd(%W( git checkout #{branch} ))
-        rescue
-          raise "Branch '#{branch}' does not exist inside #{source_path}. Please create one and try again."
-        end
-
-        unless clean_repo?
-          msg = "Automated commit at #{Time.now.utc} by nanoc #{Nanoc::VERSION}"
-          run_shell_cmd(%w( git add -A ))
-          run_shell_cmd(%W( git commit -am #{msg} ))
-        end
-        if forced
-          run_shell_cmd(%W( git push -f #{remote} #{branch} ))
-        else
-          run_shell_cmd(%W( git push #{remote} #{branch} ))
-        end
-      end
-    end
-
-    private
-
-    def run_shell_cmd(cmd)
-      if dry_run
-        puts cmd.join(' ')
-      else
-        piper = Nanoc::Extra::Piper.new(:stdout => $stdout, :stderr => $stderr)
-        piper.run(cmd, nil)
-      end
-    end
-
-    def clean_repo?
-      if dry_run && !File.exist?('.git')
-        true
-      else
-        stdout = StringIO.new
-        piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => $stderr)
-        piper.run(%w( git status --porcelain ), nil)
-        stdout.string.empty?
-      end
-    end
-  end
-end

data/lib/nanoc/git/version.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-module Nanoc
-  module Git
-    VERSION = '1.0.1'
-  end
-end

data/test/filters/test_git.rb

@@ -1,300 +0,0 @@
-# encoding: utf-8
-
-require 'helper'
-
-class Nanoc::Git::DeployerTest < Minitest::Test
-  def setup
-    # Go quiet
-    unless ENV['QUIET'] == 'false'
-      @orig_stdout = $stdout
-      @orig_stderr = $stderr
-
-      $stdout = StringIO.new
-      $stderr = StringIO.new
-    end
-
-    # Enter tmp
-    @tmp_dir = Dir.mktmpdir('nanoc-test')
-    @orig_wd = FileUtils.pwd
-    FileUtils.cd(@tmp_dir)
-  end
-
-  def teardown
-    # Exit tmp
-    FileUtils.cd(@orig_wd)
-    FileUtils.rm_rf(@tmp_dir)
-
-    # Go unquiet
-    unless ENV['QUIET'] == 'false'
-      $stdout = @orig_stdout
-      $stderr = @orig_stderr
-    end
-  end
-
-  def test_run_without_output_folder
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      {})
-
-    # Try running
-    error = assert_raises(RuntimeError) do
-      git.run
-    end
-
-    # Check error message
-    assert_equal 'output/ does not exist. Please build your site first.', error.message
-  end
-
-  def test_run_with_defaults_options
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      {})
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      false
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git init
-git config --get remote.origin.url
-git checkout master
-git add -A
-git commit -am Automated commit at .+ by nanoc \\d+\\.\\d+\\.\\d+\\w*
-git push origin master
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_run_with_clean_repository
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      {})
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      true
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git init
-git config --get remote.origin.url
-git checkout master
-git push origin master
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_run_with_custom_options
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'github', :branch => 'gh-pages', :forced => true })
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      false
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git init
-git config --get remote.github.url
-git checkout gh-pages
-git add -A
-git commit -am Automated commit at .+ by nanoc \\d+\\.\\d+\\.\\d+\\w*
-git push -f github gh-pages
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_run_without_git_init
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      {})
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      false
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output/.git')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git config --get remote.origin.url
-git checkout master
-git add -A
-git commit -am Automated commit at .+ by nanoc \\d+\\.\\d+\\.\\d+\\w*
-git push origin master
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_run_with_ssh_url
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'git@github.com:myself/myproject.git' })
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      false
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git init
-git checkout master
-git add -A
-git commit -am Automated commit at .+ by nanoc \\d+\\.\\d+\\.\\d+\\w*
-git push git@github.com:myself/myproject.git master
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_run_with_http_url
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'https://github.com/nanoc/nanoc.git' })
-
-    # Mock run_shell_cmd
-    def git.run_shell_cmd(args, opts = {})
-      @shell_cmd_args = [] unless defined? @shell_cmd_args
-      @shell_cmd_args << args.join(' ')
-    end
-
-    # Mock clean_repo?
-    def git.clean_repo?
-      false
-    end
-
-    # Create site
-    FileUtils.mkdir_p('output')
-
-    # Try running
-    git.run
-
-    commands = <<-EOS
-git init
-git checkout master
-git add -A
-git commit -am Automated commit at .+ by nanoc \\d+\\.\\d+\\.\\d+\\w*
-git push https://github.com/nanoc/nanoc.git master
-EOS
-
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
-  end
-
-  def test_clean_repo_on_a_clean_repo
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'https://github.com/nanoc/nanoc.git' })
-
-    FileUtils.mkdir_p('output')
-
-    piper = Nanoc::Extra::Piper.new(:stdout => $stdout, :stderr => $stderr)
-
-    Dir.chdir('output') do
-      piper.run('git init', nil)
-      assert git.send(:clean_repo?)
-    end
-  end
-
-  def test_clean_repo_on_a_dirty_repo
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'https://github.com/nanoc/nanoc.git' })
-
-    FileUtils.mkdir_p('output')
-
-    piper = Nanoc::Extra::Piper.new(:stdout => $stdout, :stderr => $stderr)
-    Dir.chdir('output') do
-      piper.run('git init', nil)
-      FileUtils.touch('foobar')
-      refute git.send(:clean_repo?)
-    end
-  end
-
-  def test_clean_repo_not_git_repo
-    # Create deployer
-    git = Nanoc::Git::Deployer.new(
-      'output/',
-      { :remote => 'https://github.com/nanoc/nanoc.git' })
-
-    FileUtils.mkdir_p('output')
-
-    Dir.chdir('output') do
-      assert_raises Nanoc::Extra::Piper::Error do
-        git.send(:clean_repo?)
-      end
-    end
-  end
-end

data/test/helper.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'minitest'
-require 'minitest/autorun'
-require 'nanoc'
-require 'nanoc-git'