jekyll-ghdeploy 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d07363aaf80d478a0b9845916d0e2c3e3b0ca657f534c784f74ece868521f67
-  data.tar.gz: 60e6aa00338e3dbec820c49bd43617a0df7faaa4c1de1c8065b4b20d180e0355
+  metadata.gz: 3255db3af15b988c0bb610a32296e66ed0666b2c0d0023b411b61a9ef7557e8a
+  data.tar.gz: eab2a20c505ce6ba65218a4e2dc23e8950d178c8ede4bceaf86e16cb3e390c93
 SHA512:
-  metadata.gz: 7da5efb415bf796bcf67764250f85e2256c1e059f43985d993bb07277003e78a46b8932da653d1b27ae8535e17449da64b93d86bed96e97160364ab3514fdf34
-  data.tar.gz: 8c89bba0827f521b8be9b150ff12b949414ce14394bd090bdb2ceb35cd5edb68315e40b7c4eccad2dc6fdee4e9e3de97e7255b6ace8934e83a3bf5228a59a058
+  metadata.gz: 9cad223efaa4c5862fa6296cab5fc55137317724c61c8858cc68660eeee2533469b1c0e843faf307066211d89be769ac5e74eed6305640f378eee5b965d9a3e8
+  data.tar.gz: ad6e86ca139492e9fc102c86379f68e714ca064cadac85f5908911450be68a95d289886b89acac6d99c320cbac17e18c8ef7196cb59314f4dc6cc8701236828b

data/lib/jekyll-ghdeploy.rb

@@ -19,6 +19,8 @@ module JekyllGhDeploy
         @branch = 'gh-pages'
         @message = `git log -1 --pretty=%s`
       end
+
+      @no_history = options['no_history']
     end
 
     def deploy
@@ -57,7 +59,7 @@ module JekyllGhDeploy
       Dir.chdir('clone/') do
         prepare_site
 
-        if !system 'cd _site; git log>/dev/null'
+        if !system 'cd _site; git log>/dev/null' and !@no_history
           initial_commits
         else
           build
@@ -128,7 +130,7 @@ module JekyllGhDeploy
 
         remote_branch = `git ls-remote --heads origin gh-pages`
 
-        if remote_branch.empty?
+        if remote_branch.empty? or @no_history
           system 'touch .nojekyll'
         else
           exit unless system 'git pull --rebase origin gh-pages'
@@ -165,8 +167,10 @@ module JekyllGhDeploy
     def push
       puts "\n\e[1mPushing to #{@repo} #{@branch} branch\e[0m"
 
+      option = @no_history ? '-f' : ''
+
       Dir.chdir(@dir) do
-        exit unless system "git push origin #{@branch}"
+        exit unless system "git push #{option} origin #{@branch}"
       end
     end
 
@@ -176,4 +180,4 @@ module JekyllGhDeploy
       FileUtils.rm_rf('clone')
     end
   end
-end
+end

data/lib/jekyll-ghdeploy/version.rb

@@ -1,3 +1,3 @@
 module JekyllGhDeploy
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/jekyll/commands/ghdeploy.rb

@@ -10,6 +10,7 @@ module Jekyll
 
             c.option 'docs', '--docs', '-d', 'Built site is stored into docs directory'
             c.option 'message', '--message MESSAGE', '-m MESSAGE', 'Specify a commit message'
+            c.option 'no_history', '--no_history', '-n', 'Built site will have no commit history'
 
             c.action do |args, options|
               Jekyll::Commands::GhDeploy.process(args, options)
@@ -20,7 +21,7 @@ module Jekyll
         def process(args, options = {})
           config = YAML.load_file('_config.yml')
 
-          if args.empty? && config['repository'].blank?
+          if args.empty? && config['repository'].empty?
             raise ArgumentError, 'You must specify a repository.'
           elsif args.empty?
             repo = config['repository']
@@ -28,6 +29,10 @@ module Jekyll
             repo = args[0]
           end
 
+          if options['no_history'] && options['docs']
+            raise Error, 'Options -d and -n cannot work together.'
+          end
+
           site = JekyllGhDeploy::Site.new(repo, options)
 
           at_exit do
@@ -35,9 +40,8 @@ module Jekyll
           end
 
           site.deploy
-          # site.build
         end
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ghdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Nick Garlis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Jekyll GhDeploy is a gem that helps you push your jekyll site to Github.