hyde-ftp 0.0.2 → 0.0.4

data/CHANGELOG

@@ -1,2 +1,4 @@
 Version 0.0.1: Beta Released.
-Version 0.0.2: Fixed a few bugs.
+Version 0.0.2: Fixed a few bugs.
+Version 0.0.3: Cleaned up code.
+Version 0.0.4: More code cleaning.

data/bin/hyde

@@ -1,68 +1,16 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'net/ftp'
 require 'yaml'
-require 'thor'
+require '../lib/hyde/ftp-transfer.rb'
 
-class Jekyll < Thor
+class Jekyll
 	$jekyll = Jekyll.new()
 
 	def initialize()
 		nil
 	end
 
-# FTP Stuff
-no_commands do
-	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
-end
-
-# END FTP Stuff
-
-	desc "check for Jekyll", "Check if Jekyll is on the system"
 	def exists()
 		@jekyll_version = %x( jekyll -version )
 
@@ -73,14 +21,12 @@ end
 		end
 	end
 
-	desc "new site", "Create a new Jekyll site."
 	def new_site(name)
 		$jekyll.exists()
 		%x( jekyll new #{name} )
 		puts "Site created."
 	end
 
-	desc "deploy site", "Deploy website via FTP."
 	def deploy()
 		# Build Site
 		%x( jekyll build )

data/hyde-ftp.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'hyde-ftp'
-  s.version           = '0.0.2'
+  s.version           = '0.0.4'
   s.license           = 'MIT'
   s.date              = '2013-09-12'
 
@@ -25,6 +25,7 @@ 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

@@ -1,68 +1,16 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'net/ftp'
 require 'yaml'
-require 'thor'
+require '../lib/hyde/ftp-transfer.rb'
 
-class Jekyll < Thor
+class Jekyll
 	$jekyll = Jekyll.new()
 
 	def initialize()
 		nil
 	end
 
-# FTP Stuff
-no_commands do
-	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
-end
-
-# END FTP Stuff
-
-	desc "check for Jekyll", "Check if Jekyll is on the system"
 	def exists()
 		@jekyll_version = %x( jekyll -version )
 
@@ -73,14 +21,12 @@ end
 		end
 	end
 
-	desc "new site", "Create a new Jekyll site."
 	def new_site(name)
 		$jekyll.exists()
 		%x( jekyll new #{name} )
 		puts "Site created."
 	end
 
-	desc "deploy site", "Deploy website via FTP."
 	def deploy()
 		# Build Site
 		%x( jekyll build )

data/lib/hyde/ftp-transfer.rb

@@ -0,0 +1,43 @@
+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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hyde-ftp
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jesse Herrick
@@ -44,6 +44,7 @@ extra_rdoc_files: []
 files: 
 - bin/hyde
 - lib/hyde.rb
+- lib/hyde/ftp-transfer.rb
 - CHANGELOG
 - LICENSE
 - README.md