jekyll-ghdeploy 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58fd420a3c7d45e031f1a41a2d2866067fc58505126fda6e4c7ab27fc000ffea
-  data.tar.gz: 0b9b8c17e4060b7d60a9781d4d459c880e8838e9023e9ac0356a6279b30835ef
+  metadata.gz: 9d07363aaf80d478a0b9845916d0e2c3e3b0ca657f534c784f74ece868521f67
+  data.tar.gz: 60e6aa00338e3dbec820c49bd43617a0df7faaa4c1de1c8065b4b20d180e0355
 SHA512:
-  metadata.gz: c89293b420f26bf26ceb839e31be73e64eeb26bc2fa4588ea4ed79c0caa06fd2a10b8ee4f0e725ef6e7e59b9d0a3e2063f0538c132052e74a52b0f17af5d745b
-  data.tar.gz: e47b2cf1631fb1fe957c1146318b3809ac001841b7cb00a017826855fc218de4e5651a751b65fef6bf85ef54f9aea2ba505465285ff9c3832a1cf1994430d906
+  metadata.gz: 7da5efb415bf796bcf67764250f85e2256c1e059f43985d993bb07277003e78a46b8932da653d1b27ae8535e17449da64b93d86bed96e97160364ab3514fdf34
+  data.tar.gz: 8c89bba0827f521b8be9b150ff12b949414ce14394bd090bdb2ceb35cd5edb68315e40b7c4eccad2dc6fdee4e9e3de97e7255b6ace8934e83a3bf5228a59a058

data/lib/jekyll-ghdeploy.rb

@@ -1,130 +1,179 @@
-require "rubygems"
-require "jekyll"
-require "jekyll/commands/ghdeploy"
+require 'rubygems'
+require 'jekyll'
+require 'jekyll/commands/ghdeploy'
 
 module JekyllGhDeploy
-	class Site   
-		
-		def initialize (repo, message)
-			system("clear")
-			puts "\n\e[1m\e[33mWelcome to Jekyll GhDeploy\e[39m\e[0m"
-			
-			@repo = "https://github.com/" + repo
-			@message = message
-		end
-
-		def deploy
-			clone
-
-			Dir.chdir("clone/") do
-				prepare
-				
-				if !system("cd _site; git log>/dev/null") 
-					initial_commits
-				else
-					build
-					commit
-				end
-				
-				push
-			end
-		end
-
-		def clone
-			puts "\n\e[1mCloning repository\e[0m\n\n"
-
-			FileUtils.rm_rf("clone")
-			
-			exit unless system("git clone  '.git/' 'clone/'")
-		end
-
-		def initial_commits
-			puts "\n\e[1mBuilding and commiting for every commit in master branch\e[0m\n\n"
-			
-			n = -1 + `git rev-list --count master`.to_i
-			#n = n-1
-			commit_hash=Array.new()
-			message=Array.new()
-			
-			#This is an iteration through every commit inside of master branch
-			#To get the ith commit message we need to skip n-i commits starting from HEAD 
-	
-			for i in 0..n do
-				commit_hash[i]=`git log --skip=#{n-i} --max-count=1 --pretty=%H`
-				message[i] =`git log --skip=#{n-i} --max-count=1 --pretty=%s`
-			end
-			
-			for i in 0..n do 
-				@message = message[i]
-				system("
-					git reset --hard #{commit_hash[i]}
-					echo -e '\n'
-					")
-				build
-				commit
-			end	
-		end
-
-		def prepare
-			puts "\n\e[1mPreparing _site\e[0m\n\n"
-			
-			FileUtils.rm_rf("_site")
-			Dir.mkdir "_site"
-			
-			Dir.chdir("_site/") do
-				exit unless  system("
-							 	git init
-								echo -e '\n'
-								git remote add origin #{@repo}
-								git checkout -b gh-pages
-								echo -e '\n'	
-							")
-				
-				remote_branch = `git ls-remote --heads origin gh-pages`		
-				
-				if remote_branch.empty?
-					system("touch .nojekyll")
-				else
-					exit unless system("git pull --rebase origin gh-pages")
-				end
-			end
-		end
-
-		def build
-			puts "\n\e[1mBuilding\e[0m\n\n"	
-
-          	Jekyll::Commands::Build.process(options = {})
-		end	
-
-		def commit
-			puts "\n\e[1mCommiting changes\e[0m\n\n"
-			
-			Dir.chdir("_site/") do
-				exit unless  system("
-							 	git status
-								echo -e '\n'
-								git add -A
-								echo -e '\n'
-								git status
-								echo -e '\n'
-								git commit -m '#{@message}'
-							")
-			end	
-		end
-
-		def push
-			puts "\n\e[1mPushing to #{@repo} gh-pages branch\e[0m\n\n"
-			
-			Dir.chdir("_site/") do
-				exit unless	system("git push origin gh-pages")
-			end	
-		end
-
-		def clean
-			puts "\n\n\e[1mQuiting...\e[0m\n\n"
-			
-			FileUtils.rm_rf("clone")
-		end
-	end	
-end
+  class Site
+    def initialize(repo, options = {})
+      system 'clear'
+      puts "\n\e[1m\e[33mWelcome to Jekyll GhDeploy\e[39m\e[0m"
 
+      @repo = 'https://github.com/' + repo
+
+      if options['docs'] == true
+        @dir = 'docs'
+        @branch = 'master'
+        @message = options['message']
+      else
+        @dir = '_site'
+        @branch = 'gh-pages'
+        @message = `git log -1 --pretty=%s`
+      end
+    end
+
+    def deploy
+      clone
+
+      case @dir
+      when 'docs'
+        deploy_docs
+      when '_site'
+        deploy_site
+      end
+    end
+
+    def deploy_docs
+      Dir.chdir('clone/') do
+        exit unless system 'git remote remove origin'
+        exit unless system "git remote add origin #{@repo}"
+
+        FileUtils.rm_rf('docs')
+        build
+
+        Dir.chdir('docs') { system 'touch .nojekyll' }
+
+        commit
+        push
+      end
+
+      puts "\n\e[1mUpdating local repository\e[0m"
+
+      exit unless system 'git stash'
+      exit unless system "git pull --rebase origin #{@branch}"
+      exit unless system 'git stash pop'
+    end
+
+    def deploy_site
+      Dir.chdir('clone/') do
+        prepare_site
+
+        if !system 'cd _site; git log>/dev/null'
+          initial_commits
+        else
+          build
+          commit
+        end
+
+        push
+      end
+    end
+
+    def clone
+      puts "\n\e[1mCloning repository\e[0m"
+
+      FileUtils.rm_rf('clone')
+
+      exit unless system "git clone '.git/' 'clone/'"
+
+      copy_staged_files if @dir == 'docs'
+    end
+
+    def copy_staged_files
+      staged_files = []
+
+      `git diff --name-only --cached`.each_line do |line|
+        staged_files.push(line.chomp)
+      end
+
+      FileUtils.cp_r staged_files, 'clone'
+    end
+
+    def initial_commits
+      puts "\n\e[1mBuilding and commiting for every commit in master branch\e[0m"
+
+      n = -1 + `git rev-list --count master`.to_i
+
+      commit_hash = []
+      message = []
+
+      # This is an iteration through every commit inside of master branch
+      # To get the ith commit message we need to skip n-i commits starting from HEAD
+
+      for i in 0..n do
+        commit_hash[i] = `git log --skip=#{n - i} --max-count=1 --pretty=%H`
+        message[i] = `git log --skip=#{n - i} --max-count=1 --pretty=%s`
+      end
+
+      for i in 0..n do
+        @message = message[i]
+
+        exit unless system "git reset --hard #{commit_hash[i]}"
+        puts
+
+        build
+        commit
+      end
+    end
+
+    def prepare_site
+      puts "\n\e[1mPreparing _site\e[0m"
+
+      FileUtils.rm_rf(@dir)
+      Dir.mkdir(@dir)
+
+      Dir.chdir(@dir) do
+        exit unless system 'git init'
+        exit unless system "git remote add origin #{@repo}"
+        exit unless system "git checkout -b #{@branch}"
+
+        remote_branch = `git ls-remote --heads origin gh-pages`
+
+        if remote_branch.empty?
+          system 'touch .nojekyll'
+        else
+          exit unless system 'git pull --rebase origin gh-pages'
+        end
+      end
+    end
+
+    def build
+      puts "\n\e[1mBuilding\e[0m"
+
+      options = {}
+      options['serving'] = false
+      options['destination'] = @dir
+
+      Jekyll::Commands::Build.process(options)
+    end
+
+    def commit
+      puts "\n\e[1mCommiting changes\e[0m"
+
+      Dir.chdir(@dir) do
+        system 'git add -A'
+        system 'git status'
+
+        if @message.nil?
+          puts 'Enter your commit message: '
+          @message = gets
+        end
+
+        exit unless system "git commit -m '#{@message}'"
+      end
+    end
+
+    def push
+      puts "\n\e[1mPushing to #{@repo} #{@branch} branch\e[0m"
+
+      Dir.chdir(@dir) do
+        exit unless system "git push origin #{@branch}"
+      end
+    end
+
+    def clean
+      puts "\n\n\e[1mQuiting...\e[0m"
+
+      FileUtils.rm_rf('clone')
+    end
+  end
+end

data/lib/jekyll-ghdeploy/version.rb

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

data/lib/jekyll/commands/ghdeploy.rb

@@ -5,11 +5,12 @@ module Jekyll
       class << self
         def init_with_program(prog)
           prog.command(:ghdeploy) do |c|
+            c.syntax 'deploy REPOSITORY'
+            c.description 'Deploys your site to your gh-pages branch'
+
+            c.option 'docs', '--docs', '-d', 'Built site is stored into docs directory'
+            c.option 'message', '--message MESSAGE', '-m MESSAGE', 'Specify a commit message'
 
-            c.syntax "deploy REPOSITORY"
-            
-            c.description "Deploys your site to your gh-pages branch"
-            
             c.action do |args, options|
               Jekyll::Commands::GhDeploy.process(args, options)
             end
@@ -17,29 +18,26 @@ module Jekyll
         end
 
         def process(args, options = {})
-
-          config = YAML.load_file('_config.yml')    
-          message = `git log -1 --pretty=%s`
+          config = YAML.load_file('_config.yml')
 
           if args.empty? && config['repository'].blank?
-            raise ArgumentError, "You must specify a repository."
+            raise ArgumentError, 'You must specify a repository.'
           elsif args.empty?
             repo = config['repository']
-          else 
+          else
             repo = args[0]
           end
 
-          site = JekyllGhDeploy::Site.new(repo, message)
-          
+          site = JekyllGhDeploy::Site.new(repo, options)
+
           at_exit do
-           site.clean
-          end 
-          
-          site.deploy
+            site.clean
+          end
 
-        end 
-         
-      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: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Garlis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll