hyde-ftp 0.1.1 → 0.1.2

data/bin/hyde

@@ -1,7 +1,129 @@
 #!/usr/bin/env ruby
 
+#!/usr/bin/env ruby
+
 require 'rubygems'
 require 'net/ftp'
 require 'yaml'
-require 'hyde/ftp-transfer.rb'
-require 'hyde.rb'
+require 'lib/hyde/ftp-transfer.rb'
+
+def mirror(path, ftp, initial_path = nil)
+	initial_path ||= path
+	Dir.entries(path).each do |file|
+		next if ['.', '..'].include? file
+
+		file_path = path + '/' + file
+		short_file_path = file_path[initial_path.length, file_path.length]
+		if File.directory?(file_path)
+			ftp.mkdir(file) unless ftp.nlst.index(file)
+			ftp.chdir(file)
+			mirror(file_path, ftp, initial_path)
+			ftp.chdir('..')
+		else
+			puts "Deploying: " + short_file_path
+			puts "       To: " + ftp.pwd + '/' + file
+			ftp.putbinaryfile(path + '/' + file, file)
+		end
+	end
+end
+
+def ftp_directory?(ftp, file_name)
+	ftp.chdir(file_name)
+	ftp.chdir('..')
+	true
+	rescue
+	false
+end
+
+def clean_ftp(ftp)
+	ftp.nlst.each do |file|
+		next if ['.', '..', 'bup', 'backup'].include? file
+		if ftp_directory? ftp, file
+			ftp.chdir file
+			clean_ftp(ftp)
+			ftp.chdir '..'
+			puts "Deleting directory: " + ftp.pwd + "/" + file
+			ftp.rmdir(file)
+		else
+			puts "Deleting: " + ftp.pwd + "/" + file
+			ftp.delete file
+		end
+	end
+end
+
+class Jekyll
+	$jekyll = Jekyll.new()
+
+	def initialize()
+		nil
+	end
+
+	def exists()
+		@jekyll_version = %x( jekyll -version )
+
+		if @jekyll_version[1] = "j"
+			nil
+		else
+			%x( gem install jekyll )
+		end
+	end
+
+	def new_site(name)
+		exists()
+		%x( jekyll new #{name} )
+		puts "Site created."
+	end
+
+	def deploy()
+
+		# Declare Instance Variables
+		config = YAML.load(File.read(ARGV[1]))
+
+		@ftp_server = config['server']
+		@username = config['username']
+		@password = config['password']
+		@remote_dir = config['remote_dir']
+		@local_dir = config['local_dir']
+
+		# Initialize FTP
+		ftp = Net::FTP.new(@ftp_server);
+		ftp.login(@username, @password)
+		ftp.chdir(@remote_dir)
+
+		clean_ftp(ftp)
+
+		mirror @local_dir, ftp
+
+		ftp.quit
+	end
+
+	def help()
+		command2 = ARGV[1]
+		case command2
+		when "deploy"
+			puts "Build Jekyll site and deploy via FTP."
+			puts "Usage: hyde deploy _config.yml"
+		when "new_site"
+			puts "Create a new Jekyll site."
+			puts "Usage: hyde new site_name"
+		else
+			puts "Commands:"
+			puts "         deploy\n         new_site"
+		end
+	end
+end
+
+command1 = ARGV[0]
+case command1
+when "deploy"
+	$jekyll.deploy
+when "new_site"
+	$jekyll.new_site
+when "help"
+	$jekyll.help
+when "list"
+	%x( hyde help )
+else
+	puts "You didn't give me a command.\nRun 'hyde help' to see a command list."
+end
+

data/hyde-ftp.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'hyde-ftp'
-  s.version           = '0.1.1'
+  s.version           = '0.1.2'
   s.license           = 'MIT'
-  s.date              = '2013-09-12'
+  s.date              = '2013-06-11'
 
   s.summary     = "Jekyll deployment using FTP."
   s.description = "Hyde is an addon to the amazing Jekyll that makes deploying with FTP easier."
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.files = %w[
     bin/hyde
     lib/hyde.rb
-    lib/hyde/ftp-transfer.rb
     CHANGELOG
     LICENSE
     README.md

data/lib/hyde.rb

@@ -5,6 +5,50 @@ require 'net/ftp'
 require 'yaml'
 require 'lib/hyde/ftp-transfer.rb'
 
+def mirror(path, ftp, initial_path = nil)
+	initial_path ||= path
+	Dir.entries(path).each do |file|
+		next if ['.', '..'].include? file
+
+		file_path = path + '/' + file
+		short_file_path = file_path[initial_path.length, file_path.length]
+		if File.directory?(file_path)
+			ftp.mkdir(file) unless ftp.nlst.index(file)
+			ftp.chdir(file)
+			mirror(file_path, ftp, initial_path)
+			ftp.chdir('..')
+		else
+			puts "Deploying: " + short_file_path
+			puts "       To: " + ftp.pwd + '/' + file
+			ftp.putbinaryfile(path + '/' + file, file)
+		end
+	end
+end
+
+def ftp_directory?(ftp, file_name)
+	ftp.chdir(file_name)
+	ftp.chdir('..')
+	true
+	rescue
+	false
+end
+
+def clean_ftp(ftp)
+	ftp.nlst.each do |file|
+		next if ['.', '..', 'bup', 'backup'].include? file
+		if ftp_directory? ftp, file
+			ftp.chdir file
+			clean_ftp(ftp)
+			ftp.chdir '..'
+			puts "Deleting directory: " + ftp.pwd + "/" + file
+			ftp.rmdir(file)
+		else
+			puts "Deleting: " + ftp.pwd + "/" + file
+			ftp.delete file
+		end
+	end
+end
+
 class Jekyll
 	$jekyll = Jekyll.new()
 
@@ -79,4 +123,5 @@ when "list"
 	%x( hyde help )
 else
 	puts "You didn't give me a command.\nRun 'hyde help' to see a command list."
-end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hyde-ftp
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jesse Herrick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-12 00:00:00 Z
+date: 2013-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll
@@ -43,7 +43,6 @@ extra_rdoc_files: []
 files: 
 - bin/hyde
 - lib/hyde.rb
-- lib/hyde/ftp-transfer.rb
 - CHANGELOG
 - LICENSE
 - README.md

data/lib/hyde/ftp-transfer.rb

@@ -1,43 +0,0 @@
-def mirror(path, ftp, initial_path = nil)
-	initial_path ||= path
-	Dir.entries(path).each do |file|
-		next if ['.', '..'].include? file
-
-		file_path = path + '/' + file
-		short_file_path = file_path[initial_path.length, file_path.length]
-		if File.directory?(file_path)
-			ftp.mkdir(file) unless ftp.nlst.index(file)
-			ftp.chdir(file)
-			mirror(file_path, ftp, initial_path)
-			ftp.chdir('..')
-		else
-			puts "Deploying: " + short_file_path
-			puts "       To: " + ftp.pwd + '/' + file
-			ftp.putbinaryfile(path + '/' + file, file)
-		end
-	end
-end
-
-def ftp_directory?(ftp, file_name)
-	ftp.chdir(file_name)
-	ftp.chdir('..')
-	true
-	rescue
-	false
-end
-
-def clean_ftp(ftp)
-	ftp.nlst.each do |file|
-		next if ['.', '..', 'bup', 'backup'].include? file
-		if ftp_directory? ftp, file
-			ftp.chdir file
-			clean_ftp(ftp)
-			ftp.chdir '..'
-			puts "Deleting directory: " + ftp.pwd + "/" + file
-			ftp.rmdir(file)
-		else
-			puts "Deleting: " + ftp.pwd + "/" + file
-			ftp.delete file
-		end
-	end
-end