scms 4.2.6 → 4.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDYyNWM0MTM0MWYzZjE4MDE3N2RiMjhmMzY5MmQ5YjhmN2U4NGIxNg==
+    M2Q5Yjg1ZTM4OGM2YWYxN2FlZjM3NGY5NjdjZmFjY2NkM2FkMzEyYw==
   data.tar.gz: !binary |-
-    YTM2NjlkMTQ4YWI5NmY4ZTQ2OGJiMGEwN2ZiMDU5MDYzYmE1ZGZjMw==
+    ZTFhMTIwMzFjZjYxZThiN2UyMmQzMDA4NGY3ZjYwM2M2YWJkMGY2Nw==
 SHA512:
   metadata.gz: !binary |-
-    Zjk5OWEyZTY2ZmU3YTViZmE5NGY1NWFjODMwYmJmYzZjOGQ0MTkxNDhjNWYw
-    MzdhZDJlZmE1Yjc1ODc0NjI5NmY2YmU4OTQzZDAxMzc2YTg2OWNhZDlmZDU5
-    MzMxYmEyYmNiYTg0OTg1N2E5OGZkNjQ0NmUzZWU2NjI1ZTI1MjA=
+    M2Y2YWM4NGE3Zjk2MDk0MWYyMDhlZTQ4NzYwOWVmZTAzMTMxYjUzMGY3ZDYy
+    MmNiNzFlY2JiY2JlMjU4ZWY4N2ZiNzMwZGUwMTVhYTMzZTk5MzI5YWM5YTI2
+    ZDYxMmI2MWQ2Y2VhZmQxZmMwNTk5OGYyOTViMTdjYzhmN2QwMDg=
   data.tar.gz: !binary |-
-    ZWIxNGFhYzMyYTU1OTIzMGM4YWVjODY1NmYwYWU2M2U3NTgxNWM3MWNlZDNj
-    ZjAzZTAyYzQ4ODliN2E4ODQwM2YzN2M4NTkwY2I4NGNhZjNjZmViZmI4NGJm
-    N2UyZTEyMTM2ZDg0MTc2ZDRmMWJiM2MxMmZkMzAwYTdlNTY1ZjE=
+    M2Y0NTAyYmI3ZmY0YmU2ZTI0OThiMTZhYjVkOGExMThiZGFmY2NmMzBhNWYx
+    MGMyNzMxZWI1M2VhNDk5MDQ0ZDU5NDUzY2FmOTI2ZDFiMmExNjc4OWQ3ODI4
+    Mzc2Nzc4MjM4ZmI4NWYwZmY5NjczMjI1Yjg1NjdiMWU3M2M3MzY=

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    scms (4.2.6)
+      cprobert-s3sync
+      filewatcher
+      launchy
+      listen
+      maruku
+      nokogiri
+      packr
+      sass
+      webrick
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    cprobert-s3sync (1.4.1)
+    ffi (1.9.3-x86-mingw32)
+    filewatcher (0.3.2)
+      trollop (>= 1.16.2)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    maruku (0.7.1)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1-x86-mingw32)
+      mini_portile (~> 0.5.0)
+    oyster (0.9.5)
+    packr (3.2.1)
+      oyster (>= 0.9.5)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    sass (3.2.13)
+    timers (1.1.0)
+    trollop (2.0)
+    webrick (1.3.1)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  rake
+  scms!

data/bin/scms

@@ -14,6 +14,9 @@ require "scms/version"
 require 'scms/scms-watcher.rb'
 require 'scms/scms-httpserver.rb'
 
+require 'scms/deploy-s3.rb'
+require 'scms/deploy-ftp.rb'
+
 class String
   def to_path(end_slash=false)
     "#{'/' if self[0]=='\\'}#{self.split('\\').join('/')}#{'/' if end_slash}" 
@@ -75,7 +78,11 @@ optparse = OptionParser.new do|opts|
   # This displays the help screen, all programs are assumed to have this option.
    opts.on( '-h', '--help', 'Display this help screen' ) do
      puts "Default action = build; default website directory = current working directory"
+     puts ""
      puts opts
+     puts ""
+     puts "Get the lowdown at: http://cprobert.github.io/Static-CMS"
+     puts ""
      exit
    end
 end
@@ -96,11 +103,11 @@ $website = Folders[:website]
 $watch = options[:watch]
 $cmsmode = options[:mode] == "cms"
 
-# ScmsUtils.log "System root folder = #{Folders[:root]}"
-# ScmsUtils.log "Website folder = #{Folders[:website]}"
-# ScmsUtils.log "Destination dir = #{Folders[:destination]}"
-# ScmsUtils.log "Config dir = #{Folders[:config]}"
-# ScmsUtils.log "Mode = #{options[:mode]}"
+ScmsUtils.log "System root folder = #{Folders[:root]}"
+ScmsUtils.log "Website folder = #{Folders[:website]}"
+ScmsUtils.log "Destination dir = #{Folders[:destination]}"
+ScmsUtils.log "Config dir = #{Folders[:config]}"
+ScmsUtils.log "Mode = #{options[:mode]}"
 
 raise "Invalid working directory! #{Folders[:website]}" if !File::directory?(Folders[:website])
 Dir.chdir Folders[:website]
@@ -151,4 +158,9 @@ if options[:publish]
     mimetypefile = File.join(Folders[:assets], "mime.types")   
     S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) 
   end
+
+  if File.exists?(File.join(Folders[:config], "_ftpconfig.yml"))
+    puts "Deploying to FTP"
+    FtpDeploy.sync(Folders[:website], Folders[:config])
+  end
 end

data/lib/scms/deploy-ftp.rb

@@ -0,0 +1,139 @@
+require 'net/ftp'
+require 'fileutils'
+
+require 'scms/extensions.rb'
+require 'scms/scms-utils.rb'
+
+module FtpDeploy
+  
+  # yml file example:
+
+  # host: localhost
+  # port: 21
+  # username: exampleuser
+  # password: seCre7Squr1al
+  # passive: true
+  # directory: /htdocs
+
+  def FtpDeploy.sync(website, config)
+
+    ftpYamlPath=File.join(config, "_ftpconfig.yml")
+    settings = YAML.load_file(ftpYamlPath)
+    throw "No gost defined in _ftpconfig.yml settings file" if settings['host'] == nil
+
+    host = settings['host']
+    port = (settings['port'] || 21).to_i
+    passive  = settings['passive'] || true
+    remote_dir = settings['directory'] || "/"
+
+    ScmsUtils.boldlog("Sending site over FTP (host: #{host}, port: #{port})")
+    begin
+      if settings['username'].nil?
+        print "FTP Username: "
+        username = $stdin.gets.chomp
+      else
+        username = settings['username']
+      end
+
+      if settings['password'].nil?
+        print "FTP Password: "
+        # We hide the entered characters before to ask for the password
+        system "stty -echo"
+        password = $stdin.gets.chomp
+        system "stty echo"
+      else
+        password = settings['password']
+      end
+    rescue NoMethodError, Interrupt
+      # When the process is exited, we display the characters again
+      # And we exit
+      system "stty echo"
+      exit
+    end
+
+    ftp = FtpDeploy::Ftp.new(host, port, {:username => username, :password => password, :passive => passive})
+    puts "\r\nConnected to server. Sending site"
+    ftp.sync(website, remote_dir)
+    puts "Successfully sent site"
+  end
+
+  class Ftp
+    attr_reader :host, :port, :username, :password, :passive
+
+    def initialize(host, port = 21, options = Hash.new)
+      options = {:username => nil, :password => nil}.merge(options)
+      @host, @port = host, port
+      @username, @password = options[:username], options[:password]
+      @passive = options[:passive]
+    end
+
+    def sync(local, distant)
+      connect do |ftp|
+        send_dir(ftp, local, distant)
+      end
+    end
+
+    private
+    def connect
+      begin
+        Net::FTP.open(host) do |ftp|
+          ftp.passive = @passive
+          #ftp.debug_mode = true
+          ftp.connect(host, port)
+          ftp.login(username, password)
+          puts ftp.welcome
+          yield ftp
+        end
+      rescue Exception=>e
+        ScmsUtils.errLog(e.message)
+        ScmsUtils.log(e.backtrace.inspect)
+      end
+    end
+
+    def send_dir(ftp, local, distant)
+      begin
+        ftp.mkdir(distant)
+      rescue Net::FTPPermError
+        # We don't do anything. The directory already exists.
+        # TODO : this is also risen if we don't have write access. Then, we need to raise.
+      end
+      Dir.foreach(local) do |file_name|
+        
+        # If the file/directory is hidden (first character is a dot), we ignore it
+        next if file_name =~ /^(\.|\.\.)$/
+        next if file_name =~ /^(\.)/
+        next if file_name =~ /^_/
+
+        #puts file_name
+
+        if ::File.stat(local + "/" + file_name).directory?
+          # It is a directory, we recursively send it
+          begin
+            ftp.mkdir(distant + "/" + file_name)
+          rescue Net::FTPPermError
+            # We don't do anything. The directory already exists.
+            # TODO : this is also risen if we don't have write access. Then, we need to raise.
+          end
+          send_dir(ftp, local + "/" + file_name, distant + "/" + file_name)
+        else
+           # It's a file, we just send it
+           localFilePath = local + "/" + file_name
+           remoteFilePath = distant + "/" + file_name
+
+           if File.binary?(local + "/" + file_name)
+             puts "#{file_name} (binary)"
+             ftp.putbinaryfile(localFilePath, remoteFilePath)
+           else
+             puts "#{file_name} (text)"
+             ftp.puttextfile(localFilePath, remoteFilePath)
+           end
+        end
+      end
+    end
+
+    private
+    def host_with_port
+      "#{host}:#{port}"
+    end
+  end
+end

data/lib/scms/extensions.rb

@@ -0,0 +1,21 @@
+class File
+
+  # def self.is_bin?(f)
+  #   file_test = %x(file #{f})
+
+  #   # http://stackoverflow.com/a/8873922
+  #   file_test = file_test.encode('UTF-16', 'UTF-8', :invalid => :replace, :replace => '').encode('UTF-8', 'UTF-16')
+
+  #   file_test !~ /text/
+  # end
+
+  def File.binary? name
+    open name do |f|
+      while (b=f.read(256)) do
+        return true if b[ "\0"]
+      end
+    end
+    false
+  end
+
+end

data/lib/scms/scms-watcher.rb

@@ -61,7 +61,7 @@ module ScmsWatcher
 		# Listen to changed to folders that start with an underscore (_)
 		folders = []
 	    Dir.glob('*').select { |fn| File.directory?(fn) and (fn.match(/^_/) ) }.each do|f|
-			folders.push(f) 
+			folders.push(f)
 		end
 	    puts "Listening to #{folders}"
 	    listener = Listen.to(folders, force_polling: true) do |modified, added, removed|

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.2.6"
+  VERSION = "4.3.0"
 end

data/lib/scms.rb

@@ -6,7 +6,6 @@ module Scms
     require 'scms/scms-bundler.rb'
     require 'scms/scms-parser.rb'
     require 'scms/scms-xmlhandler.rb'
-    require 'scms/s3deploy.rb'
 
     require 'fileutils'
     require 'pathname'
@@ -50,6 +49,7 @@ module Scms
                     ScmsUtils.writelog("type NUL > #{bootstrap}", website)
                 end
             end 
+            ScmsUtils.log("Generating pages")
             Scms.generatePages(website, settings, options)
         else
             ScmsUtils.errLog("Config is empty")
@@ -60,10 +60,32 @@ module Scms
     end
 
     def Scms.generatePages(website, settings, options)
-        # build pages defined in config file
-        Scms.generatePagesFromSettings(website, settings, options)
         # build pages pased on _pages folder
         Scms.generatePagesFromFolder(website, settings, options)
+        # build pages defined in config file
+        Scms.generatePagesFromSettings(website, settings, options)
+    end
+
+    def Scms.generatePagesFromFolder(website, settings, options)
+        pagesFolder = File.join(website, "_pages")
+        Dir.glob("#{pagesFolder}/**/*/").each do |pageFolder|
+            pagename = File.basename(pageFolder, ".*")
+            pageconfig = nil
+            pageconfig = Scms.getSettings(pageFolder) if File.exists?(File.join(pageFolder, "_config.yml"))
+            pageOptions = PageOptions.new(pagename, website, pageconfig, settings)
+            views = Hash.new {}
+            if pageconfig != nil
+                views = Scms.getSettingsViews(pageconfig["views"], website, pageOptions, options) if pageconfig["views"] != nil
+            end
+            
+            Dir.glob(File.join(pageFolder, "*")).reject { |f| f =~ /\.yml$/ || File.directory?(f) }.each do |view|
+                viewname = File.basename(view, ".*")
+                viewpath = Pathname.new(view).relative_path_from(Pathname.new(website)).to_s
+                viewmodel = Scms.getViewModel(viewname, viewpath, website, pageOptions, options)
+                views[viewname] = Scms.renderView(viewpath, viewmodel)
+            end
+            Scms.savePage(settings, website, pageOptions, views, options)
+        end
     end
 
     def Scms.generatePagesFromSettings(website, settings, options)
@@ -105,28 +127,6 @@ module Scms
         return views
     end
 
-    def Scms.generatePagesFromFolder(website, settings, options)
-        pagesFolder = File.join(website, "_pages")
-        Dir.glob("#{pagesFolder}/**/*/").each do |pageFolder|
-            pagename = File.basename(pageFolder, ".*")
-            pageconfig = nil
-            pageconfig = Scms.getSettings(pageFolder) if File.exists?(File.join(pageFolder, "_config.yml"))
-            pageOptions = PageOptions.new(pagename, website, pageconfig, settings)
-            views = Hash.new {}
-            if pageconfig != nil
-                views = Scms.getSettingsViews(pageconfig["views"], website, pageOptions, options) if pageconfig["views"] != nil
-            end
-            
-            Dir.glob(File.join(pageFolder, "*")).reject { |f| f =~ /\.yml$/ || File.directory?(f) }.each do |view|
-                viewname = File.basename(view, ".*")
-                viewpath = Pathname.new(view).relative_path_from(Pathname.new(website)).to_s
-                viewmodel = Scms.getViewModel(viewname, viewpath, website, pageOptions, options)
-                views[viewname] = Scms.renderView(viewpath, viewmodel)
-            end
-            Scms.savePage(settings, website, pageOptions, views, options)
-        end
-    end
-
     def Scms.getViewModel(viewname, viewpath, website, pageOptions, options, viewData = nil)
         #puts "parsing view: #{viewname}"
 

data/scms.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "webrick"
   spec.add_dependency "launchy"
   spec.add_dependency "nokogiri"
+  #spec.add_dependency "ptools"
   
   #spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/setup.cmd

@@ -0,0 +1,4 @@
+@echo off
+
+@call gem install bundler
+@call bundle install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.3.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -162,6 +162,7 @@ files:
 - .gitattributes
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -224,7 +225,9 @@ files:
 - bin/scms-server
 - build commands.txt
 - lib/scms.rb
-- lib/scms/s3deploy.rb
+- lib/scms/deploy-ftp.rb
+- lib/scms/deploy-s3.rb
+- lib/scms/extensions.rb
 - lib/scms/scms-bundler.rb
 - lib/scms/scms-customHandler.rb
 - lib/scms/scms-helpers.rb
@@ -237,6 +240,7 @@ files:
 - lib/scms/version.rb
 - lib/scms/yui.rb
 - scms.gemspec
+- setup.cmd
 homepage: http://cprobert.github.io/Static-CMS/
 licenses:
 - MIT