fjords 1.0.3 → 1.1.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 Thomas Reynolds
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/fjords.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("highline")
   gem.add_dependency("progress_bar")
-  gem.add_dependency("fjords-client", "1.0.1")
+  gem.add_dependency("fjords-client", "1.1.0")
 end

data/lib/fjords/cli/core.rb

@@ -62,7 +62,8 @@ class Fjords::Cli::Core
     return if @help_only
     require_login!
     
-    sites = Fjords::Client.sites
+    show_deleted = @options[:deleted] || false
+    sites = Fjords::Client.sites(show_deleted)
 
     if sites.length > 0
       rows = sites.map do |site|
@@ -70,16 +71,44 @@ class Fjords::Cli::Core
         domain = site['internal_name']
         domain = site['custom_name'] if site['custom_name'] != domain
         
-        d = DateTime.parse(site['created_at'])
+        if site['deleted_at']
+          d = DateTime.parse(site['deleted_at'])
+          deleting_at = time_to_expiry(d.to_time.to_i)
+          cdn_status = 'no'
+        else
+          d = DateTime.parse(site['created_at'])
+          deleting_at = site['type'] === 'temporary' ? time_to_expiry(d.to_time.to_i + (60 * 60 * 24 * 30)) : 'never'
+          
+          cdn_status = if site['cdn_enabled']
+            # site['cdn_status']
+            'yes'
+          else
+            'no'
+          end
+        end
+
         [
           domain,
-          site['type'],
+          site['type'] == 'with_dns' ? 'yes' : 'no',
+          site['gzip_assets'] ? 'yes' : 'no',
+          cdn_status,
           cost,
-          site['type'] === 'temporary' ? time_to_expiry(d.to_time.to_i + (60 * 60 * 24 * 30)) : 'never'
+          deleting_at,
+          d
         ]
-      end
+      end.sort do |a, b|
+        if a[4] == 'never' && b[4] == 'never'
+          a[0] <=> b[0]
+        elsif a[4] == 'never'
+          -1
+        elsif b[4] == 'never'
+          1
+        else
+          a[5] <=> b[5]
+        end
+      end.map { |r| r[0...-1] }
 
-      rows.unshift ["Domain", "Type", "Cost", "Expires"]
+      rows.unshift ["Domain", "DNS?", "Gzip?", "CDN?", "Cost", "Expires"]
       puts
       print_table(rows, :indent => 2)
     else
@@ -110,6 +139,62 @@ class Fjords::Cli::Core
     true
   end
 
+  def site_details(domain)
+    return if @help_only
+    require_login!
+    
+    site = Fjords::Client.site_details(domain)
+
+    if site
+      cost = "$#{(site['cost'] / 100.00).to_i}"
+      domain = site['internal_name']
+      domain = site['custom_name'] if site['custom_name'] != domain
+      
+      if site['deleted_at']
+        d = DateTime.parse(site['deleted_at'])
+        deleting_at = time_to_expiry(d.to_time.to_i)
+        cdn_status = 'no'
+      else
+        d = DateTime.parse(site['created_at'])
+        deleting_at = site['type'] === 'temporary' ? time_to_expiry(d.to_time.to_i + (60 * 60 * 24 * 30)) : 'never'
+        
+        cdn_status = if site['cdn_enabled']
+          # site['cdn_status']
+          "yes ($#{(site['cost'] > 0 ? '2' : '0')})"
+        else
+          'no'
+        end
+      end
+
+      output = []
+      output << ["Domain:", domain]
+      output << ["Custom DNS:", site['type'] == 'with_dns' ? "yes ($#{(site['cost'] > 0 ? '2' : '0')})" : 'no']
+
+      if site['type'] == 'with_dns'
+        output << ["Point DNS At:", site['internal_name']]
+      end
+
+      output << ["CDN Enabled:", cdn_status]
+      if site['cdn_enabled']
+        output << ["Point CDN DNS At:", site['cdn_internal_name']]
+      end
+
+      output << ["Gzip Enabled:", site['gzip_assets'] ? 'yes' : 'no']
+
+      output << ["Expires At:", deleting_at]
+
+      output << ["Montly Cost:", cost]
+
+      puts
+      print_table(output, :indent => 2)
+    else
+      say %Q{Error: Could not find site "#{domain}".}
+      exit(0)
+    end
+
+    true
+  end
+
   def push
     return if @help_only
     require_login!
@@ -323,6 +408,92 @@ class Fjords::Cli::Core
     end
   end
 
+  def enable_cdn(domain)
+    return if @help_only
+    require_login!
+
+    puts
+
+    has_cdn = Fjords::Client::has_cdn(domain)
+
+    if has_cdn
+      say %Q{Error: CDN already enabled for site "#{domain}".}
+      exit(0)
+    elsif site = Fjords::Client::enable_cdn(domain)
+      say %Q{Enabled CDN for "#{domain}".}
+      say "Deploying your files around the planet takes some time."
+      say "Please be patient."
+      puts
+
+      say "In the meantime,"
+      say "Make sure your CNAME points to: #{site["cdn_internal_name"]}"
+
+      true
+    else
+      say %Q{Error: Could not find site "#{domain}" to enable CDN for.}
+      exit(0)
+    end
+  end
+
+  def disable_cdn(domain)
+    return if @help_only
+    require_login!
+
+    puts
+
+    has_cdn = Fjords::Client::has_cdn(domain)
+
+    if !has_cdn
+      say %Q{Error: CDN is not enabled for site "#{domain}".}
+      exit(0)
+    elsif Fjords::Client::disable_cdn(domain)
+      say %Q{Disabled CDN for "#{domain}"}
+      true
+    else
+      say %Q{Error: Could not find site "#{domain}" to disable CDN for.}
+      exit(0)
+    end
+  end
+
+  def enable_gzip(domain)
+    return if @help_only
+    require_login!
+
+    puts
+
+    has_gzip = Fjords::Client::has_gzip(domain)
+
+    if has_gzip
+      say %Q{Error: Gzipping already enabled for site "#{domain}".}
+      exit(0)
+    elsif Fjords::Client::enable_gzip(domain)
+      say %Q{Enabled Gzipping Assets for "#{domain}".}
+      true
+    else
+      say %Q{Error: Could not find site "#{domain}" to enable Gzipping for.}
+      exit(0)
+    end
+  end
+
+  def disable_gzip(domain)
+    return if @help_only
+    require_login!
+
+    puts
+
+    has_gzip = Fjords::Client::has_gzip(domain)
+
+    if !has_gzip
+      say %Q{Error: Gzipping is not enabled for site "#{domain}".}
+      exit(0)
+    elsif Fjords::Client::disable_gzip(domain)
+      say %Q{Disabled Gzipping Assets for "#{domain}"}
+      true
+    else
+      say %Q{Error: Could not find site "#{domain}" to disable Gzipping for.}
+      exit(0)
+    end
+  end
 private
 
   def available_editor(preferred=nil)
@@ -439,16 +610,22 @@ private
   def time_to_expiry(from_time)
     to_time = DateTime.now.to_time.to_i
     distance_in_minutes = (((from_time - to_time))/60).round
-
-    case distance_in_minutes
-      when 0..1        then distance_in_minutes == 0 ? "in less than a minute" : "in 1 minute"
-      when 2..44       then "in #{distance_in_minutes} minutes"
-      when 45..89      then "in 1 hour"
-      when 90..1439    then "in #{(distance_in_minutes.to_f / 60.0).round} hours"
-      when 1440..2519  then "in 1 day"
-      when 2520..43199 then "in #{(distance_in_minutes.to_f / 1440.0).round} days"
+    abs_distance_in_minutes = distance_in_minutes.abs
+
+    res = case abs_distance_in_minutes
+      when 0..1        then abs_distance_in_minutes == 0 ? "less than a minute" : "1 minute"
+      when 2..44       then "#{abs_distance_in_minutes} minutes"
+      when 45..89      then "1 hour"
+      when 90..1439    then "#{(abs_distance_in_minutes.to_f / 60.0).round} hours"
+      when 1440..2519  then "1 day"
       else
-        "already expired"
+        "#{(abs_distance_in_minutes.to_f / 1440.0).round} days"
+    end
+
+    if distance_in_minutes > 0
+      "in #{res}"
+    else
+      "#{res} ago"
     end
   end
 end

data/lib/fjords/cli/runner.rb

@@ -18,6 +18,7 @@ module Fjords::Cli::Runner
       opts.on('--overwrite') { |overwrite| @options[:overwrite] = overwrite }
       opts.on('--no-zip') { |no_zip| @options[:no_zip] = !no_zip }
       opts.on('--no-progress') { |no_progress| @options[:no_progress] = !no_progress }
+      opts.on('--deleted') { |deleted| @options[:deleted] = deleted }
       opts.on('--permanent') { |permanent| @options[:permanent] = permanent }
       opts.on('--domain-file DOMAIN_FILE') { |domain_file| @options[:domain_file] = domain_file }
       opts.on('-h', '--help') { puts "#{command_usage}\n"; exit }
@@ -34,12 +35,22 @@ module Fjords::Cli::Runner
       help if @args.size == 0
       @help_only = true
       parse_command!
-    when 'nameservers'
-      usage('fjords nameservers')
-      nameservers
+    # when 'nameservers'
+    #   usage('fjords nameservers')
+    #   nameservers
     when 'sites'
-      usage('fjords sites')
+      usage('fjords sites [--deleted]')
       sites
+    when 'site:details'
+      usage('fjords ite:details DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+      
+      site_details(@args[0])
     when 'push'
       usage('fjords push [--path PATH] [--domain DOMAIN] [--domain-file DOMAIN_FILE]')
       push
@@ -54,7 +65,54 @@ module Fjords::Cli::Runner
       signup
     when 'remove'
       usage('fjords remove DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+
       remove(@args[0])
+    when 'cdn:enable'
+      usage('fjords cdn:enable DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+
+      enable_cdn(@args[0])
+    when 'cdn:disable'
+      usage('fjords cdn:disable DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+      
+      disable_cdn(@args[0])
+    when 'gzip:enable'
+      usage('fjords gzip:enable DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+
+      enable_gzip(@args[0])
+    when 'gzip:disable'
+      usage('fjords gzip:disable DOMAIN')
+
+      if !@args[0] || @args[0].length < 1
+        puts
+        puts "Error: DOMAIN argument required"
+        exit(0)
+      end
+      
+      disable_gzip(@args[0])
     when 'bugreport'
       usage('fjords bugreport [--attach ERROR_FILE]')
       bugreport

data/lib/fjords/cli/usage.rb

@@ -35,22 +35,29 @@ module Fjords::Cli::Usage
 Currently available af commands are:
 
   Getting Started
-    login            Login to Fjords
-    logout           Logout of Fjords
-    signup           Create an account
-    info             Get your account information, including current plan costs
+    login               Login to Fjords
+    logout              Logout of Fjords
+    signup              Create an account
+    info                Get your account information, including costs
 
   Sites
-    sites            List deployed sites
-    remove DOMAIN    Remove a deployed site
+    sites               List deployed sites
+    site:details DOMAIN Information about a specific domain
+    remove DOMAIN       Remove a deployed site
+
+  Site Features
+    cdn:enable DOMAIN   Enable the Content Delivery Network
+    cdn:disable DOMAIN  Disable the Content Delivery Network
+    gzip:enable DOMAIN  Enable Gzipping of assets (HTML, CSS, JS)
+    gzip:disable DOMAIN Disable Gzipping of assets (HTML, CSS, JS)
 
   Site Creation
-    push             Push a new site
+    push                Push a new site
 
   Help
-    help [command]   Get general help or help on a specific command
-    help options     Get help on available options
-    bugreport        Send a bug-report
+    help [command]      Get general help or help on a specific command
+    help options        Get help on available options
+    bugreport           Send a bug-report
 USAGE
 
   end

data/lib/fjords/version.rb

@@ -1,3 +1,3 @@
 module Fjords
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fjords
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 description: Fjords.cc CLI
 email:
 - me@tdreyno.com
@@ -69,6 +69,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - Rakefile
 - bin/fjords
 - fjords.gemspec
@@ -92,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -801899354192103421
+      hash: -582392878008552670
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -801899354192103421
+      hash: -582392878008552670
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23