octopress-deploy 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6479e61abefc814081c0a514ffd00a0295db9f0d
-  data.tar.gz: 433ace76c70c4461d91a1eb514523e9cdb9f57eb
+  metadata.gz: 86e904b2e06c8c70df12dd4e301e97099f1619d4
+  data.tar.gz: 0044b426419d4fee6189e79f240139cb7fb76f7a
 SHA512:
-  metadata.gz: c199172a1401517d3c0dff85ce3368879f70b4ca506d60e851fd45baf22e3dd14590953f7533f96fa6b63210a5a886ba5343a5f59c5551f0a1e1fe849dba37ed
-  data.tar.gz: 384d08b0ace02b48ba8bf52e333dc5a4ebc3ca4e2a61f942f061c570a8d46ba5a3a1200479a5aec4f4a601eb9c1fbbced1c81c15efb98c9cf3a7b84f8472b184
+  metadata.gz: 203001699d0cef653430a2cdc9cbf4b9bc8670377253e4abb2560ae112dc730b747b3b9a08cdc72a5934d43372d6d1e8f2a8b3a5446d1727f1cc5bb97f27e919
+  data.tar.gz: 3fbf19b756ae0ee62fd35f3b4d0e6e3c751251b8afea2a58620a088390bfbe718e949f06aa8d6ef0f47f41e0ded8f142a48a47eaa71ca1fee5a1d366a5c8fc7d

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-### 1.2.5
+### 1.2.6 - 2015-05-15
+- Fix: Tell users to build their sites if the build dir doesn't exist.
+
+### 1.2.5 - 2015-05-15
 - Fix: Ensures that deployment git remote is the same as configuration before pushing.
 
 ### 1.2.4 - 2015-05-11

data/lib/octopress-deploy/git.rb

@@ -18,14 +18,18 @@ 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
-          git_pull
-          clean_deploy
-          copy_site
-          git_push
+        if File.exist?(@site_dir)
+          check_branch
+          init_repo
+          puts "Syncing #{@site_dir.sub(Dir.pwd.strip+'/', '')} files to #{@repo}."
+          FileUtils.cd @deploy_dir do
+            git_pull
+            clean_deploy
+            copy_site
+            git_push
+          end
+        else
+          abort "Cannot find site build at #{@site_dir}. Be sure to build your site first."
         end
       end
 

data/lib/octopress-deploy/rsync.rb

@@ -20,8 +20,12 @@ module Octopress
       end
 
       def push
-        puts "Syncing #{@local} files to #{@remote_path} with rsync."
-        system cmd
+        if File.exist?(@site_dir)
+          puts "Syncing #{@local} files to #{@remote_path} with rsync."
+          system cmd
+        else
+          abort "Cannot find site build at #{@local}. Be sure to build your site first."
+        end
       end
 
       def pull

data/lib/octopress-deploy/s3.rb

@@ -34,10 +34,14 @@ module Octopress
         if !@bucket.exists?
           abort "Bucket not found: '#{@bucket_name}'. Check your configuration or create a bucket using: `octopress deploy add-bucket`"
         else
-          puts "Syncing #{@local} files to #{@bucket_name} on S3."
-          write_files
-          delete_files if delete_files?
-          status_message
+          if File.exist?(@local)
+            puts "Syncing #{@local} files to #{@bucket_name} on S3."
+            write_files
+            delete_files if delete_files?
+            status_message
+          else
+            abort "Cannot find site build at #{@local}. Be sure to build your site first."
+          end
         end
       end
 

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Brandon Mathis