nanoc-git 0.0.7 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 149d3ce1ac2618693cecb4012183416eecc8e75f
+  data.tar.gz: bb5ba8c9c5d493db2d49bec4e3b51ad0d2572d53
+SHA512:
+  metadata.gz: a82b71839715cfd7d6a06caa7d1653971c80ebfccc9e617825d6b1d23aafc5fffe0e49091755e0b3dede7166b11a9ef14452d5b5a5d31ba34274dac9ec177178
+  data.tar.gz: 58147d1895ddd1fc7c15cf2c92deb23928171daf53aee256f9216dac8e9f030f989d542df15c94e95ffaae3498706ca300693882f604b29ddc28f28f33060860

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,5 @@
+# nanoc-git news
+
+## 1.0.0 (???)
+
+Initial release.

data/README.md

@@ -0,0 +1,31 @@
+[![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).
+
+## 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`
+

data/Rakefile

@@ -1,15 +1,10 @@
 # encoding: utf-8
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'rake/testtask'
 
-$LOAD_PATH.unshift 'lib'
+Rake::TestTask.new do |t|
+  t.libs = %w( lib test )
+  t.test_files = FileList['test/**/test_*.rb', 'test/**/*_spec.rb']
+end
 
 task :default => :test
-
-desc "Run tests"
-task :test do
-  Dir['test/*_test.rb'].each do |f|
-    require File.expand_path(f)
-  end
-end

data/lib/nanoc-git.rb

@@ -1,8 +1,3 @@
 # encoding: utf-8
 
-# Load requirements
-require 'nanoc3'
-
-# Load nanoc-git
-require 'nanoc-git/base'
-require 'nanoc-git/extra'
+require 'nanoc/git'

data/lib/nanoc/git.rb

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

data/lib/nanoc/git/deployer.rb

@@ -0,0 +1,90 @@
+# 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

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

data/nanoc-git.gemspec

@@ -1,20 +1,29 @@
-# -*- encoding: utf-8 -*-
+# 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     = '0.0.7'
-  s.authors     = ["Cameron Spickert"]
-  s.email       = ["cspicker@gmail.com"]
-  s.homepage    = "https://github.com/cspicker/nanoc-git"
-  s.summary     = "A Nanoc3 deployer for git"
-  s.description = "A Nanoc3 extension that adds a Git deployer and associated rake task."
+  s.version     = Nanoc::Git::VERSION
+  s.homepage    = 'http://nanoc.ws/'
+  s.summary     = 'Git deployer for nanoc'
+  s.description = 'Provides a git depoyer for nanoc'
+
+  s.author  = 'Lifepillar'
+  s.email   = 'github@lifepillar.org'
+  s.license = 'MIT'
+
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.rubyforge_project = "nanoc-git"
+  s.files              = Dir['[A-Z]*'] +
+                         Dir['{lib,test}/**/*'] +
+                         [ 'nanoc-git.gemspec' ]
+  s.require_paths      = [ 'lib' ]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.rdoc_options     = [ '--main', 'README.md' ]
+  s.extra_rdoc_files = [ 'LICENSE', 'README.md', 'NEWS.md' ]
 
-  s.add_runtime_dependency('nanoc', '>= 3.1.6')
-  s.add_runtime_dependency('git', '>= 1.2.5')
+  s.add_runtime_dependency('nanoc', '>= 3.7.0', '< 4.0.0')
+  s.add_development_dependency('bundler', '~> 1.5')
 end

data/test/filters/test_external.rb

@@ -0,0 +1,300 @@
+# 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+
+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+
+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+
+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+
+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+
+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

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

metadata

@@ -1,80 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-git
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
-- Cameron Spickert
+- Lifepillar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-01 00:00:00.000000000 -04:00
-default_executable: 
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
-  requirement: &2156089080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156089080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: git
-  requirement: &2156088420 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :runtime
+        version: '1.5'
+  type: :development
   prerelease: false
-  version_requirements: *2156088420
-description: A Nanoc3 extension that adds a Git deployer and associated rake task.
-email:
-- cspicker@gmail.com
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+description: Provides a git depoyer for nanoc
+email: github@lifepillar.org
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE
+- README.md
+- NEWS.md
 files:
-- .gitignore
 - Gemfile
+- Gemfile.lock
+- LICENSE
+- NEWS.md
+- README.md
 - Rakefile
 - lib/nanoc-git.rb
-- lib/nanoc-git/base.rb
-- lib/nanoc-git/extra.rb
-- lib/nanoc-git/extra/deployers.rb
-- lib/nanoc-git/extra/deployers/git.rb
-- lib/nanoc-git/tasks.rb
-- lib/nanoc-git/tasks/deploy/git.rake
+- lib/nanoc/git.rb
+- lib/nanoc/git/deployer.rb
+- lib/nanoc/git/version.rb
 - nanoc-git.gemspec
-has_rdoc: true
-homepage: https://github.com/cspicker/nanoc-git
-licenses: []
+- test/filters/test_external.rb
+- test/helper.rb
+homepage: http://nanoc.ws/
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nanoc-git
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
-summary: A Nanoc3 deployer for git
+specification_version: 4
+summary: Git deployer for nanoc
 test_files: []
+has_rdoc: 

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-.rvmrc
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-

data/lib/nanoc-git/base.rb

@@ -1,2 +0,0 @@
-module NanocGit
-end

data/lib/nanoc-git/extra.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc-git'
-
-module NanocGit::Extra
-  autoload 'Deployers', 'nanoc-git/extra/deployers'
-end

data/lib/nanoc-git/extra/deployers.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc-git'
-
-module NanocGit::Extra
-  module Deployers
-    autoload 'Git', 'nanoc-git/extra/deployers/git'
-  end
-end

data/lib/nanoc-git/extra/deployers/git.rb

@@ -1,102 +0,0 @@
-require 'git'
-
-module NanocGit::Extra::Deployers
-  
-  # A class for deploying a site using git.
-  class Git
-    
-    # Creates a new deployer that uses git. The deployment configurations
-    # will be read from the configuration file of the site (which is assumed
-    # to exist).
-    #
-    # The deployment configurations are stored like this in the site's
-    # configuration file:
-    #
-    #  deploy:
-    #    NAME:
-    #      dst_remote: origin
-    #      dst_branch: master
-    #      src_branch: source
-    #
-    # `NAME` is a unique name for the deployment configuration. By default,
-    # the deployer will use the deployment configuration named `"default"`.
-    #
-    # `DST_REMOTE` is the remote repository to which you are deploying your
-    # site.
-    #
-    # `DST_BRANCH` is the branch to which you are deploying your compiled site.
-    #
-    # `SRC_BRANCH` is the branch that contains the source files for your site.
-    #
-    def initialize
-      error 'No site configuration found' unless File.file?('config.yaml')
-      @site = Nanoc3::Site.new('.')
-    end
-    
-    # Runs the task. Possible params:
-    #
-    # @option params [String] :config_name (:default) The name of the
-    #   deployment configuration to use.
-    #
-    # @return [void]
-    def run(params={})
-      config_name = params.has_key?(:config_name) ? params[:config_name].to_sym : :default
-
-      # Validate config
-      error 'No deploy configuration found'                    if @site.config[:deploy].nil?
-      error "No deploy configuration found for #{config_name}" if @site.config[:deploy][config_name].nil?
-      
-      src_branch = @site.config[:deploy][config_name][:src_branch]
-      dst_branch = @site.config[:deploy][config_name][:dst_branch]
-      dst_remote = @site.config[:deploy][config_name][:dst_remote]
-      
-      error 'No source branch found in deployment configuration' if src_branch.nil?
-      error 'No destination branch found in deployment configuration' if dst_branch.nil?
-      error 'No destination remote found in deployment configuration' if dst_remote.nil?
-    
-      git = ::Git::Base.open('.')
-      
-      # Compile the site from scratch
-      Nanoc3::Tasks::Clean.new(@site).run
-      
-      # Check out the source branch
-      puts "Checking out #{src_branch}."
-      git.checkout(src_branch)
-      
-      # Compile the site from scratch
-      puts "Compiling site."
-      @site.load_data
-      @site.compiler.run
-      
-      # Check out the destination branch
-      puts "Checking out destination branch."
-      git.checkout(dst_branch)
-      
-      # Copy output files recursively into the current directory
-      puts "Copying files."
-      FileUtils.cp_r(@site.config[:output_dir].chomp('/') + '/.', '.')
-      
-      # Automatically add and commit changes
-      puts "Committing changes."
-      git.add
-      git.commit("updated #{Time.now.to_s}", :add_all => true)
-      
-      # Push changes to the destination repo/branch
-      puts "Pushing to #{dst_remote} #{dst_branch}."
-      git.push(dst_remote, dst_branch)
-      
-      # Switch back to the source branch
-      puts "Checking out #{src_branch}."
-      git.checkout(src_branch)
-    end
-    
-  private
-
-    # Prints the given message on stderr and exits.
-    def error(msg)
-      raise RuntimeError.new(msg)
-    end
-
-  end
-  
-end

data/lib/nanoc-git/tasks.rb

@@ -1,10 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc-git'
-require 'rake'
-
-module NanocGit::Tasks
-end
-  
-Dir[File.dirname(__FILE__) + '/tasks/**/*.rb'].each   { |f| load f }
-Dir[File.dirname(__FILE__) + '/tasks/**/*.rake'].each { |f| Rake.application.add_import(f) }

data/lib/nanoc-git/tasks/deploy/git.rake

@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-namespace :deploy do
-  desc 'Upload the compiled site using git'
-  task :git do
-    config_name = ENV['config'] || :default
-    
-    deployer = NanocGit::Extra::Deployers::Git.new
-    deployer.run(:config_name => config_name)
-  end
-end