jekyll-staging 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 998fa4dd69ea57ee2a2e9603bac9efc3db466569
-  data.tar.gz: fcf22ca82c1782191fa89828822895a952b8eb8a
+  metadata.gz: d74d3f0315b7ebb1a323c30803583d65e7d86350
+  data.tar.gz: 376e454356e4352d0940aba35412539e77a82d77
 SHA512:
-  metadata.gz: d890ece7c923187574281ba72cb05407ec23c844c8286acbf73b1e77c9b08935d5e56b642de5fb5cd0fc09a1d2a9d0d2246d3f4f029ee51019836d0f65beb87b
-  data.tar.gz: 8e9180ba87fa2aeb5b149db51a5a02064a52cb34f10a0e0607e0ea6dcecf2155bc51d21577f733c47457f33f042b76ba1cc7f916f1c9250cb78bcd573fa8f1f0
+  metadata.gz: 24c7e96adf27cbc5e50b78ebb33818cb8b2bc987caeefc858176aeda19386815e3767e69fe8f03a49ee7f4906c18f129c697fe50d8ec2ad03d8aede12409b153
+  data.tar.gz: a3e1e1c4c019c7db2a2e41324bd3dfa69ea26fc5d7c4a70bdefc57f362c113c6285fa46ec67eb83176f34542d79f7fa10bc8913c2a2c17c068d81f8f631b14eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-staging (1.0.2)
+    jekyll-staging (1.0.3)
 
 GEM
   remote: https://rubygems.org/

data/README.markdown

@@ -46,11 +46,11 @@ Basically:
 
 You don't need to specify full paths, because it'll be looking in your drafts folder anyway. Feel free to use partial filenames, and shell glob patterns. If there's more than one match, it'll use the first one, and it'll output the full list of matches as well as the filename it chose.
 
-Let's say you had a draft whose filename was `got-a-new-iphone.markdown`. A typical workflow would be:
+Let's say you had a draft whose filename was `my-new-iphone.markdown`. A typical workflow would be as follows. It assumes you're already in your Jekyll site's root directory.
 
 1. **`stage iphone`** (stage the draft for Jekyll)
 
-2. **`jekyll serve`** (start the built-in web server, changing to your Jekyll directory first)
+2. **`jekyll serve`** (start the built-in web server)
 
 3. Edit your post as you see fit, and view it in your browser. When you're done, kill Jekyll's web server.
 
@@ -61,7 +61,7 @@ You can then decide whether to publish the post, and build and deploy your site
 
 ## Where does it temporarily put my other posts?
 
-In a directory called "`_stash`", in your Jekyll site's local root directory. The directory will be created if necessary. You can set a configuration option to make it use a different directory, if you want.
+In a directory called "`_stash`", in your Jekyll site's local root directory. The directory will be created if necessary.
 
 
 ## Should I run it on my server?

data/bin/stage

@@ -239,10 +239,27 @@ def unstage_file(the_filename_glob)
 end
 
 
+def staging_in_progress()
+	# Try to determine if file(s) are already staged.
+	
+	in_progress = false
+	if directory_exists($stash_dir)
+		Dir.chdir($stash_dir)
+		matches = Dir.glob("*.#{$file_extension}")
+		if matches.count > 0
+			# Posts are in the stash directory. We're probably staging.
+			in_progress = true
+		end
+	end
+	
+	return in_progress
+end
+
+
 def show_help()
-	puts "`#{$0} FILENAME_GLOB` stages the first matching draft."
-	puts "`#{$0} #{$unstage_flag}` unstages the first staged post."
-	puts "`#{$0} #{$unstage_flag} FILENAME_GLOB` unstages the first matching staged post."
+	puts "`stage FILENAME_GLOB` stages the first matching draft."
+	puts "`stage #{$unstage_flag}` unstages the first staged post."
+	puts "`stage #{$unstage_flag} FILENAME_GLOB` unstages the first matching staged post."
 end
 
 
@@ -310,6 +327,19 @@ if directory_exists($stash_dir) == false
 	end
 end
 
+# Check whether we should proceed.
+if !unstage and staging_in_progress()
+	puts "It looks like files are already staged. You should unstage them first (stage #{$unstage_flag})."
+	puts "Do you want to proceed anyway? (y/n) [n]"
+	proceed = STDIN.gets.strip.downcase.slice(0,1)
+	if !proceed or proceed != "y"
+		puts "Aborting."
+		exit
+	else
+		puts "Proceeding anyway."
+	end
+end
+
 # Get the job done. It's a bit anticlimactic, really.
 if unstage
 	unstage_file(filename_glob)

data/jekyll-staging.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-staging"
-  spec.version       = "1.0.2"
+  spec.version       = "1.0.3"
   spec.authors       = ["Matt Gemmell"]
   spec.email         = ["matt@mattgemmell.com"]
   spec.summary       = %q{Stage and unstage draft posts in Jekyll.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-staging
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Matt Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler