zapnito-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1df975bf83ac9b353ff15a52da5e9640b5d61b1
-  data.tar.gz: 2384fe2b3a648593099f3b8dc5ba5e5b5dcefaef
+  metadata.gz: 169fd8403f72defe4f3cebee0e9d77918fc9ca13
+  data.tar.gz: af38f52b665d4c62c1270db7309ec276de3d0dee
 SHA512:
-  metadata.gz: 6009e072865c6b6b3c589cac4de45f6d1eff86ad653565c77d2b26c243b224ad94d42ec2862bf784d6b61629d37dc6fd4bfbd1841ad7fd923c274065de2d4f50
-  data.tar.gz: c71b9d5e3fd55f4827ae2a583d89b1b579e470da6832b8287281fd3052d2301532c4b51dda46debce14d22adf5cca0dd42efa7e367727b5d1576526f3d1d8677
+  metadata.gz: e105c1892608df4ad4df0e58c92d566c1e3b4d0c74c491906b68ad68f784f30e58c2251b956ca4044f48445434e45c70f1eaaed9b0f5c7d90629db193d7a6a33
+  data.tar.gz: a78c68658e6b98dae590a0520a6928e189baba01fec51f92b880576c2566566715c286e0bb933cf93b79895a43a3f7e55b48c980cd012f9cc327d42ed112d41c

data/README.md

@@ -4,33 +4,73 @@
 
     $ gem install zapnito-cli
 
-Add your api token to `~/.zapnito`
 
-    {
-      "apiToken": "yourZapnitoApiToken"
+## Configure
+Add the following configuration to `~/.zapnito`
+```JSON
+{
+  "environments": {
+    "development": {
+        "basepath": "http://zapnito.localhost",
+        "token": "your dev API token"
+    },
+    "stage": {
+        "basepath": "https://staging-zapnito.com",
+        "token": "your stage API token"
+    },
+    "production": {
+        "basepath": "https://zapnito.com",
+        "token": "your production API token"
     }
+  },
+  "debug": false
+}
+```
+Your api_token is generated automatically and is available on your account (`user.api_token`).
+
+The environments are all optional, commands will be shown for a particular environment if the configuration is provided.
+
 
 ## Usage
 
 ### Create a theme for a tenant
+This will create a new directory for the tenant with the basic folder structure for a theme.
 
     $ zapnito theme add
 
 ### Publish a theme
+To upload the theme to s3.
 
-    $ zapnito theme publish
+    $ zapnito theme production:publish
 
 ### Preview in browser
+This will open a preview in the browser. Note, you need to publish a theme before previewing.
 
-    $ zapnito theme preview
+    $ zapnito theme production:preview
 
 ### Generate a preview link to share
 
-    $ zapnito theme preview_link
+    $ zapnito theme production:preview_link
 
-## Development options
+## Development
 
+### Options
+The following may be adding to your `~/.zapnito` config. `developmentThemeDir` is required if you want to run the executable.
+```
   {
+    "environments": ...
     "proxy": "http://localhost:8888",
-    "debug": true
+    "debug": true,
+    "developmentThemeDir: "path/to/local/theme/used/when/developing"
   }
+```
+
+### Running the cli
+To run the cli during development use
+```
+bundle exec ./exe/zapnito
+```
+
+
+### Gem tasks
+See `rake -T` for a list of tasks

data/lib/zapnito/cli.rb

@@ -1,5 +1,6 @@
 require "pry"
 
+require 'ruby-try'
 require "zapnito/cli/version"
 require "zapnito/cli/utils"
 require "zapnito/cli/initializers/configatron"
@@ -13,6 +14,7 @@ require "zapnito/cli/services"
 require "zapnito/cli/questions"
 require "thor"
 require "zapnito/cli/commands/theme"
+require "zapnito/cli/commands/environment"
 require "zapnito/cli/commands/development_theme"
 require "zapnito/cli/commands/stage_theme"
 require "zapnito/cli/commands/production_theme"
@@ -20,14 +22,23 @@ require "zapnito/cli/commands/production_theme"
 module Zapnito
   module Cli
     class Main < Thor
-      desc "development:theme COMMANDS", "Development Theme control"
-      subcommand "development:theme", Zapnito::Cli::Commands::DevelopmentTheme
+      desc "theme COMMANDS", "General theme commands"
+      subcommand "theme", Zapnito::Cli::Commands::Theme
 
-      desc "stage:theme COMMANDS", "Stage theme control"
-      subcommand "stage:theme", Zapnito::Cli::Commands::StageTheme
+      if configatron.environments.has_key?(:development)
+        desc "development:theme COMMANDS", "Development Theme control"
+        subcommand "development:theme", Zapnito::Cli::Commands::DevelopmentTheme
+      end
 
-      desc "production:theme COMMANDS", "Production Theme control"
-      subcommand "production:theme", Zapnito::Cli::Commands::ProductionTheme
+      if configatron.environments.has_key?(:stage)
+        desc "stage:theme COMMANDS", "Stage theme control"
+        subcommand "stage:theme", Zapnito::Cli::Commands::StageTheme
+      end
+
+      if configatron.environments.has_key?(:production)
+        desc "production:theme COMMANDS", "Production Theme control"
+        subcommand "production:theme", Zapnito::Cli::Commands::ProductionTheme
+      end
     end
   end
 end

data/lib/zapnito/cli/commands/development_theme.rb

@@ -6,7 +6,7 @@ require "highline"
 module Zapnito
   module Cli
     module Commands
-      class DevelopmentTheme < Theme
+      class DevelopmentTheme < Environment
         def environment
           :development
         end

data/lib/zapnito/cli/commands/environment.rb

@@ -0,0 +1,70 @@
+require "rest-client"
+require "json"
+require "launchy"
+require "highline"
+
+module Zapnito
+  module Cli
+    module Commands
+      class Environment < Thor
+        desc "publish", "publishes the theme in the current directory"
+        def publish
+          theme = Services.local.load
+          puts "---> Publishing #{theme.tenant_slug}"
+
+          release_config = zapnito.s3_upload_urls_for_theme(theme)
+          Services.s3.upload_theme(theme, release_config)
+          zapnito.build_release(theme)
+
+          puts "---> Published #{theme.tenant_slug}/#{theme.revision}"
+        rescue Exception => e
+          if e.try(:response).try(:code) == 406
+            show_sass_error(e)
+          else
+            raise e
+          end
+        end
+
+        desc "preview_link", "show preview link for current theme"
+        def preview_link
+          theme = Services.local.load
+          link = zapnito.preview_link(theme)
+          puts "---> #{link}"
+        end
+
+        desc "preview", "preview current theme in browser"
+        def preview
+          theme = Services.local.load
+          link = zapnito.preview_link(theme)
+          puts "link: #{link}"
+          Launchy.open(link)
+        end
+
+        private
+
+        def zapnito
+          Services.zapnito(api_token, basepath)
+        end
+
+        def show_sass_error(e)
+          error = JSON.parse(e.response)["error"]
+          puts "---! #{error["message"]}"
+          puts "=========================="
+          puts "---! #{error["sass_backtrace"]}"
+        end
+
+        def api_token
+          configatron.environments[environment].api_token!
+        end
+
+        def basepath
+          configatron.environments[environment].basepath!
+        end
+
+        def environment
+          raise "not implemented"
+        end
+      end
+    end
+  end
+end

data/lib/zapnito/cli/commands/production_theme.rb

@@ -6,7 +6,7 @@ require "highline"
 module Zapnito
   module Cli
     module Commands
-      class ProductionTheme < Theme
+      class ProductionTheme < Environment
         def environment
           :production
         end

data/lib/zapnito/cli/commands/stage_theme.rb

@@ -6,7 +6,7 @@ require "highline"
 module Zapnito
   module Cli
     module Commands
-      class StageTheme < Theme
+      class StageTheme < Environment
         def environment
           :stage
         end

data/lib/zapnito/cli/commands/theme.rb

@@ -3,6 +3,7 @@ require "json"
 require "launchy"
 require "highline"
 
+
 module Zapnito
   module Cli
     module Commands
@@ -12,64 +13,6 @@ module Zapnito
           tenant_slug = Questions.which_slug?(api_token)
           Services.local.create_theme!(tenant_slug)
         end
-
-        desc "publish", "publishes the theme in the current directory"
-        def publish
-          theme = Services.local.load
-          puts "---> Publishing #{theme.tenant_slug}"
-
-          release_config = zapnito.s3_upload_urls_for_theme(theme)
-          Services.s3.upload_theme(theme, release_config)
-          zapnito.build_release(theme)
-
-          puts "---> Published #{theme.tenant_slug}/#{theme.revision}"
-        rescue Exception => e
-          if e.response.code == 406
-            show_sass_error(e)
-          else
-            raise e
-          end
-        end
-
-        desc "preview_link", "show preview link for current theme"
-        def preview_link
-          theme = Services.local.load
-          link = zapnito.preview_link(theme)
-          puts "---> #{link}"
-        end
-
-        desc "preview", "preview current theme in browser"
-        def preview
-          theme = Services.local.load
-          link = zapnito.preview_link(theme)
-          puts "link: #{link}"
-          Launchy.open(link)
-        end
-
-        private
-
-        def zapnito
-          Services.zapnito(api_token, basepath)
-        end
-
-        def show_sass_error(e)
-          error = JSON.parse(e.response)["error"]
-          puts "---! #{error["message"]}"
-          puts "=========================="
-          puts "---! #{error["sass_backtrace"]}"
-        end
-
-        def api_token
-          configatron.environments[environment].api_token!
-        end
-
-        def basepath
-          configatron.environments[environment].basepath!
-        end
-
-        def environment
-          raise "not implemented"
-        end
       end
     end
   end

data/lib/zapnito/cli/initializers/configatron.rb

@@ -1,15 +1,23 @@
 require "configatron"
 require "json"
 
+def assign_environment_config!(json_config)
+  puts json_config.inspect
+  if json_config
+    configatron_environment = yield
+    configatron_environment.basepath = json_config["basepath"]
+    configatron_environment.api_token = json_config["apiToken"]
+  end
+end
+
 begin
   config = JSON.parse(File.read(File.expand_path("~/.zapnito")))
+  environments = config["environments"]
+  raise "Invalid json structure, see README for details" unless environments
 
-  configatron.environments.development.basepath = config["environments"]["development"]["basepath"]
-  configatron.environments.development.api_token = config["environments"]["development"]["apiToken"]
-  configatron.environments.stage.basepath = config["environments"]["stage"]["basepath"]
-  configatron.environments.stage.api_token = config["environments"]["stage"]["apiToken"]
-  configatron.environments.production.basepath = config["environments"]["production"]["basepath"]
-  configatron.environments.production.api_token = config["environments"]["production"]["apiToken"]
+  assign_environment_config!(environments["development"]) { configatron.environments.development }
+  assign_environment_config!(environments["stage"]) { configatron.environments.stage }
+  assign_environment_config!(environments["production"]) { configatron.environments.production }
 
   configatron.working_dir = begin
     dir_name = Dir.getwd

data/lib/zapnito/cli/version.rb

@@ -1,5 +1,5 @@
 module Zapnito
   module Cli
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/zapnito-cli.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json", "1.8.3"
   spec.add_dependency "thread_safe", "0.3.4"
   spec.add_dependency "minitest", "5.1"
+  spec.add_dependency "ruby-try", "1.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapnito-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - opsb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -220,6 +220,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: ruby-try
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +295,7 @@ files:
 - exe/zapnito
 - lib/zapnito/cli.rb
 - lib/zapnito/cli/commands/development_theme.rb
+- lib/zapnito/cli/commands/environment.rb
 - lib/zapnito/cli/commands/production_theme.rb
 - lib/zapnito/cli/commands/stage_theme.rb
 - lib/zapnito/cli/commands/theme.rb
@@ -316,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Command line tools for Zapnito