octopress-deploy 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff0f9e0959198ae73ff8b5de4129ded2bd17f35
-  data.tar.gz: 4c93019f735109467267faa368d09abff0dce862
+  metadata.gz: 5193cab4ce08ed883a01384d2c19594fc38a5864
+  data.tar.gz: c024077ddeab7a639be25ed7c7b77bc4df94564e
 SHA512:
-  metadata.gz: 61a6e8bcd5edb808d9f9c182f1f52c298b49d9df6272abc5b8f333cc41d665375b8722a258518e30e7387b327229f1fc9ab5cc4c38716bcd913f118eabde8b40
-  data.tar.gz: bd42c36239eef26e3f11a95066d2e0c6c17aaf3016d46fef7cf91755556109d42de99fd2ad1ec5c51efa07838d0ce26bba9f6bd8268595395c6d9655c494f085
+  metadata.gz: c328742b9202f1a5690730b8e3ccc1f7989cb46caf423336416c9aefe85234953019724d70ebca6bc3ea01acbc1388523792c3c2f09ac480002a7904e36080be
+  data.tar.gz: 2bed2d3d3bf4c6ea848ed085d7c1abc576e0b2e3637db47ade8dc8556c935b900009edbe226e8ff3b4829707adb968f33c4312ec7b6069c0d9d5818ab01f5022

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.1 - 2015-04-28
+- Fix: On deploy init git, moved git URL from option to argument since it is required.
+- Minor: Now preventing deploy to working branch, complete with helpful error message.
+
 ### 1.2.1 - 2015-04-25 
 
 - Fix: Rsync exclude and include options now work properly with multiple items.

data/README.md

@@ -26,7 +26,7 @@ $ gem install octopress
 First set up a configuration file for your deployment method.
 
 ```
-$ octopress deploy init git --url git@github.com:user/project
+$ octopress deploy init git git@github.com:user/project
 $ octopress deploy init s3
 $ octopress deploy init rsync
 ```

data/lib/octopress-deploy/commands.rb

@@ -45,9 +45,8 @@ module Octopress
             end
 
             c.command(:git) do |c|
-              c.syntax 'git [options]'
+              c.syntax 'git <URL> [options]'
               c.description "Create a git deployment configuration file."
-              c.option 'git_url', '-u', '--url URL', 'Git url (e.g. git@github.com:user/project)'
               c.option 'git_branch', '-b', '--branch NAME', 'Branch to deploy to (default: master)'
               c.option 'remote_path', '-d', '--dir DIR', 'Deploy site into a subdirectory.'
               c.option 'delete', '--delete', 'Sync file deletion'
@@ -55,8 +54,9 @@ module Octopress
 
               c.action do |args, options|
                 options['method'] = 'git'
+                options['git_url'] = args.first
                 if options['git_url']
-                  options['git_url'].sub!(/^\./, Dir.pwd)
+                  options['git_url'] = options['git_url'].sub(/^\./, Dir.pwd)
                 else
                   $stderr.puts "git url missing"
                   puts c # print the help

data/lib/octopress-deploy/git.rb

@@ -18,6 +18,7 @@ module Octopress
       # Initialize, pull, copy and deploy.
       #
       def push
+        check_branch
         init_repo
         puts "Syncing #{@site_dir.sub(Dir.pwd.strip+'/', '')} files to #{@repo}."
         FileUtils.cd @deploy_dir do
@@ -32,9 +33,29 @@ module Octopress
         `git clone -b #{@branch} #{@repo} #{@pull_dir}`
       end
 
+      # Ensure that the deploy branch is not that same as the current working branch
+      #
+      def check_branch
+        same_branch = `git branch -a` =~ /\* #{@branch}/
+
+        if current_remote = `git remote -v`.match(/\s\S+/)
+          same_remote = current_remote[0].match(/#{@repo}/)
+        end
+
+        if same_remote && same_branch
+          puts "Deploy to #{@branch} canceled:".red 
+          puts "You cannot deploy to the same branch you are working in. This will overwrite the source for your site.\n"
+          puts "First, back up your site's source to a branch:"
+          puts "\n  git checkout -b source".yellow
+          puts "  git push origin source".yellow
+          puts "\nWith that, you'll work in the #{"source".bold} branch and deploy to the #{@branch.bold} branch."
+          abort
+        end
+      end
+
       # Check to see if local deployment dir is configured to deploy.
       #
-      def check_repo
+      def check_deploy_dir
         if Dir.exist? @deploy_dir
           FileUtils.cd @deploy_dir do
             return `git remote -v`.include? @repo
@@ -60,7 +81,7 @@ CONFIG
       # If necessary create deploy directory and initialize it with deployment remote.
       #
       def init_repo
-        return if check_repo
+        return if check_deploy_dir
         FileUtils.mkdir_p @deploy_dir
         FileUtils.cd @deploy_dir do
           if Dir[@deploy_dir+'/*'].empty?

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/test/_clash.yml

@@ -27,7 +27,7 @@
   before: 
     - reset
     - git init --bare local-git
-    - octopress deploy init git --branch test_git_deploy --url ./local-git --dir site --config _git_deploy_local.yml --force
+    - octopress deploy init git ./local-git --branch test_git_deploy --dir site --config _git_deploy_local.yml --force
     - octopress deploy --config _git_deploy_local.yml
     - octopress deploy pull pull-git --config _git_deploy_local.yml
     - rm -rf pull-git/.git
@@ -37,7 +37,7 @@
   title: Test remote Git
   before: 
     - reset
-    - octopress deploy init git --branch test_git_deploy --url git@github.com:octopress/deploy --config _git_deploy.yml --force
+    - octopress deploy init git git@github.com:octopress/deploy --branch test_git_deploy --config _git_deploy.yml --force
     - octopress deploy --config _git_deploy.yml
     - octopress deploy pull pull-git --config _git_deploy.yml
     - rm -rf pull-git/.git

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easily deploy any Jekyll or Octopress site using S3, Git, or Rsync.