ghpages_deploy 1.2.0 → 1.3.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0436432a44b28101714bc20cac8812fe3fd00563
-  data.tar.gz: 56b3aed8727505be7741038697f500732779dbe7
+  metadata.gz: a2f243b6938f96d439dd81b4c1b5905984b77172
+  data.tar.gz: 17d7063cdc3dbd38bc96c75220f27636a7df6a5d
 SHA512:
-  metadata.gz: b5affce950ae25c6822e9f16dfeabbd3fba7f1a36bd71893bb5d970594cf1c37eef1d28d1a1c2abd54f666d77875d28ef1ed59a0e689cea268334f91af3481fa
-  data.tar.gz: 3f975339ba95fce47ce450f9cd66852a3e5a27886d58a5fb88cffe2dff27c0b653aef21f91bcc2ef4880aa396fd0fcbe72aa625caf2453fb6a49d4a94201a112
+  metadata.gz: 6231675491a4079cc4487d60681efcceb237963d1b01dcaf072560b29d7953814a016ab055b078d37f5d5446c79173018f38a1e9b081b00927257da9d14231ec
+  data.tar.gz: 416d44a2ea9a809fab181a1e2c7b29b365dd7e28bc321421f286ff85314ac2dd9076c296bb43240dd2346e0fec03f9c0c4cea4d5e8b09645871bb81be3b99d1a

data/ghpages_deploy.gemspec

@@ -20,7 +20,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'bundler', '>= 1.11.2'
-
   spec.add_dependency 'git'
 end

data/lib/ghpages_deploy/deployer.rb

@@ -6,10 +6,11 @@ require 'ghpages_deploy/git_manager'
 
 module GithubPages
   class Deployer
-    def initialize(git, source, destinations)
+    def initialize(git, source, destinations, handler)
       @git = git
       @source = source
       @destinations = destinations
+      @handler = handler
     end
 
     def deploy
@@ -36,6 +37,7 @@ module GithubPages
       FileUtils.cp_r("#{@source}/.", dest)
 
       stage_destination_files(dest)
+      @git.stage @handler.on_deploy if @handler
 
       # check if any changes were made to the destination
       !@git.staged_modifications(dest).empty?

data/lib/ghpages_deploy/git_manager.rb

@@ -32,7 +32,7 @@ module GithubPages
     end
 
     def stage(files)
-      @git.add files
+      @git.add files unless files.empty?
     end
 
     def staged_modifications(dir)
@@ -80,21 +80,22 @@ module GithubPages
       @git.config('user.email', ENV['GIT_EMAIL']) if ENV['GIT_EMAIL']
     end
 
+    def remove_staged
+      to_remove = staged_modifications('.')
+      @git.remove(to_remove) unless to_remove.empty?
+    end
+
     def setup_branch
       if @git.is_local_branch?(branch)
         @git.branch(branch).checkout
+        remove_staged
       elsif @git.is_remote_branch?(branch)
         git "checkout #{remote}/#{branch} -b #{branch}"
+        remove_staged
+        @git.pull(remote, branch)
       else
         git "checkout --orphan #{branch}"
-      end
-
-      # remove files already staged by checkout
-      to_remove = staged_modifications('.')
-      @git.remove(to_remove) unless to_remove.empty?
-
-      if @git.is_remote_branch?(branch)
-        @git.pull(remote, branch)
+        remove_staged
       end
     end
 

data/lib/ghpages_deploy/handler.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+# Copyright (c) 2016 Nathan Currier
+
+module GithubPages
+  class Handler
+    def self.def_handler(sym)
+      define_method(:"on_#{sym}") do |*args, &block|
+        handlers[method].each { |handle| handle.call(*args, &block) }
+        nil
+      end
+
+      define_method(:"handle_#{sym}") do |&block|
+        handlers[method] << block
+        nil
+      end
+    end
+
+    def_handler :deploy
+
+    private
+
+    def handlers
+      @handlers ||= Hash.new { |h, k| h[k] = [] }
+    end
+  end
+end

data/lib/ghpages_deploy/rake/jekyll.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+# Copyright (c) 2016 Nathan Currier
+
+require 'ghpages_deploy/rake/task'
+
+module GithubPages
+  module JekyllRakeExt
+    def init_jekyll
+      @handler.handle_deploy do
+        FileUtils.touch('.nojekyll') unless File.exist?('.nojekyll')
+        ['.nojekyll']
+      end
+    end
+  end
+
+  DeployTask.include JekyllRakeExt
+end

data/lib/ghpages_deploy/rake/json.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+# Copyright (c) 2016 Nathan Currier
+
+require 'json'
+
+require 'ghpages_deploy/rake/task'
+
+module GithubPages
+  module JsonRakeExt
+    # designed for a documentation sitemap
+    # best used with a format similar to the following:
+    #
+    # tag/
+    #   v1.0.0/
+    #     _index.html
+    #     ...
+    #   v1.1.0/
+    #     index.html
+    #     _index.html
+    #     ...
+    #   ...
+    # branch/
+    #   master/
+    #     index.html
+    #     ...
+    #   ...
+    #
+
+    def self.update_sitemap
+      File.open('sitemap.json', 'w+') do |file|
+        file.write directory_sitemap('.').to_json
+      end
+    end
+
+    def self.directory_sitemap(dir)
+      puts dir
+      index =
+        %w(index.html _index.html).find do |html|
+          File.exist?(File.join(dir, html))
+        end
+
+      return {File.basename(dir) => index} if index
+
+      Hash[Dir.foreach(dir).flat_map do |file|
+        file_dir = File.join(dir, file)
+        next [] if %w(.git . ..).include?(file)
+        next [] unless Dir.exist?(file_dir)
+
+        map = directory_sitemap(file_dir)
+        next [] if map.empty?
+        [file, map]
+      end]
+    end
+
+    def json_sitemap
+      @handler.handle_deploy do
+        JsonRakeExt.update_sitemap
+        ['sitemap.json']
+      end
+    end
+  end
+
+  DeployTask.include JsonRakeExt
+end

data/lib/ghpages_deploy/rake/task.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+# Copyright (c) 2016 Nathan Currier
+
+require 'rake'
+require 'rake/tasklib'
+
+require 'ghpages_deploy/deployer'
+require 'ghpages_deploy/git_manager'
+
+module GithubPages
+  class DeployTask < ::Rake::TaskLib
+    def initialize(*args)
+      @args = args
+      @destinations = []
+
+      yield self if block_given?
+
+      @source ||= '.'
+      @remote ||= 'origin'
+
+      @destinations << '.' if @destinations.empty?
+
+      @handler = Handler.new
+    end
+
+    attr_accessor :remote, :source
+    attr_reader :handler
+
+    def register(destination)
+      @destinations << destination
+    end
+
+    private
+
+    def define
+      task(*@args) do
+        GitManager.open(@remote) do |git|
+          deployer = Deployer.new(git, @source, @destinations)
+          deployer.deploy(@handler)
+        end
+      end
+    end
+  end
+end

data/lib/ghpages_deploy/rake_task.rb

@@ -1,43 +1,7 @@
 # encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
-require 'rake'
-require 'rake/tasklib'
+require 'ghpages_deploy/rake/task'
 
-require 'ghpages_deploy/deployer'
-require 'ghpages_deploy/git_manager'
-
-module GithubPages
-  class DeployTask < ::Rake::TaskLib
-    def initialize(*args)
-      @args = args
-      @destinations = []
-
-      yield self if block_given?
-
-      @source ||= '.'
-      @remote ||= 'origin'
-
-      @destinations << '.' if @destinations.empty?
-
-      define
-    end
-
-    attr_accessor :remote, :source
-
-    def register(destination)
-      @destinations << destination
-    end
-
-    private
-
-    def define
-      task(*@args) do
-        GitManager.open(@remote) do |git|
-          deployer = Deployer.new(git, @source, @destinations)
-          deployer.deploy
-        end
-      end
-    end
-  end
-end
+require 'ghpages_deploy/rake/json'
+require 'ghpages_deploy/rake/jekyll'

data/lib/ghpages_deploy/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2016 Nathan Currier
 
 module GithubPages
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0-beta1'.freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ghpages_deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.pre.beta1
 platform: ruby
 authors:
 - Nathan Currier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  type: :runtime
-  name: bundler
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
 - !ruby/object:Gem::Dependency
   type: :runtime
   name: git
@@ -53,6 +39,10 @@ files:
 - lib/ghpages_deploy/compress.rb
 - lib/ghpages_deploy/deployer.rb
 - lib/ghpages_deploy/git_manager.rb
+- lib/ghpages_deploy/handler.rb
+- lib/ghpages_deploy/rake/jekyll.rb
+- lib/ghpages_deploy/rake/json.rb
+- lib/ghpages_deploy/rake/task.rb
 - lib/ghpages_deploy/rake_task.rb
 - lib/ghpages_deploy/util.rb
 - lib/ghpages_deploy/version.rb
@@ -71,9 +61,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8