zapnito-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63373cd6200e8b040420c5e49bf0bfe8ed2c1c70
-  data.tar.gz: 7e8345df5ea324bbb2bbe52bc0ca11a5fbea2f60
+  metadata.gz: f1df975bf83ac9b353ff15a52da5e9640b5d61b1
+  data.tar.gz: 2384fe2b3a648593099f3b8dc5ba5e5b5dcefaef
 SHA512:
-  metadata.gz: 75b39804f624702913356f2853b0f132cdbadae7634e489831b9f46aa33b10b4454ba89f326e56db0f69047c1ef8dce88ab03b3983294d701f57f4e180695d4a
-  data.tar.gz: 8ed213185b3f0c9c7c6b37ed3f54f37e2db667ceb5120ab20cafde048a9850b44bbeb01ba67eafa4edabe2fa17c1c913e13e996fa666a2d26b5287ce67f655b3
+  metadata.gz: 6009e072865c6b6b3c589cac4de45f6d1eff86ad653565c77d2b26c243b224ad94d42ec2862bf784d6b61629d37dc6fd4bfbd1841ad7fd923c274065de2d4f50
+  data.tar.gz: c71b9d5e3fd55f4827ae2a583d89b1b579e470da6832b8287281fd3052d2301532c4b51dda46debce14d22adf5cca0dd42efa7e367727b5d1576526f3d1d8677

data/lib/zapnito/cli.rb

@@ -13,12 +13,21 @@ require "zapnito/cli/services"
 require "zapnito/cli/questions"
 require "thor"
 require "zapnito/cli/commands/theme"
+require "zapnito/cli/commands/development_theme"
+require "zapnito/cli/commands/stage_theme"
+require "zapnito/cli/commands/production_theme"
 
 module Zapnito
   module Cli
     class Main < Thor
-      desc "theme COMMANDS", "Theme control"
-      subcommand "theme", Zapnito::Cli::Commands::Theme
+      desc "development:theme COMMANDS", "Development Theme control"
+      subcommand "development:theme", Zapnito::Cli::Commands::DevelopmentTheme
+
+      desc "stage:theme COMMANDS", "Stage theme control"
+      subcommand "stage:theme", Zapnito::Cli::Commands::StageTheme
+
+      desc "production:theme COMMANDS", "Production Theme control"
+      subcommand "production:theme", Zapnito::Cli::Commands::ProductionTheme
     end
   end
 end

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

@@ -0,0 +1,16 @@
+require "rest-client"
+require "json"
+require "launchy"
+require "highline"
+
+module Zapnito
+  module Cli
+    module Commands
+      class DevelopmentTheme < Theme
+        def environment
+          :development
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require "rest-client"
+require "json"
+require "launchy"
+require "highline"
+
+module Zapnito
+  module Cli
+    module Commands
+      class ProductionTheme < Theme
+        def environment
+          :production
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require "rest-client"
+require "json"
+require "launchy"
+require "highline"
+
+module Zapnito
+  module Cli
+    module Commands
+      class StageTheme < Theme
+        def environment
+          :stage
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Zapnito
       class Theme < Thor
         desc "add", "add a new tenant"
         def add
-          tenant_slug = Questions.which_slug?
+          tenant_slug = Questions.which_slug?(api_token)
           Services.local.create_theme!(tenant_slug)
         end
 
@@ -18,9 +18,9 @@ module Zapnito
           theme = Services.local.load
           puts "---> Publishing #{theme.tenant_slug}"
 
-          release_config = Services.zapnito.s3_upload_urls_for_theme(theme)
+          release_config = zapnito.s3_upload_urls_for_theme(theme)
           Services.s3.upload_theme(theme, release_config)
-          Services.zapnito.build_release(theme)
+          zapnito.build_release(theme)
 
           puts "---> Published #{theme.tenant_slug}/#{theme.revision}"
         rescue Exception => e
@@ -34,25 +34,42 @@ module Zapnito
         desc "preview_link", "show preview link for current theme"
         def preview_link
           theme = Services.local.load
-          link = Services.zapnito.preview_link(theme)
+          link = zapnito.preview_link(theme)
           puts "---> #{link}"
         end
 
         desc "preview", "preview current theme in browser"
         def preview
           theme = Services.local.load
-          link = Services.zapnito.preview_link(theme)
+          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,23 +1,15 @@
 require "configatron"
 require "json"
 
-missing_token_warning = """
-Add your apiToken to ~/.zapnito
-{
-  \"apiToken\": \"your_zapnito_api_token\"
-}
-
-"""
-
 begin
   config = JSON.parse(File.read(File.expand_path("~/.zapnito")))
 
-  configatron.api_token = config["apiToken"] || begin
-    puts missing_token_warning
-    exit
-  end
-
-  configatron.basepath = config["basepath"] || "https://zapnito.com"
+  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"]
 
   configatron.working_dir = begin
     dir_name = Dir.getwd

data/lib/zapnito/cli/questions.rb

@@ -3,11 +3,11 @@ module Zapnito
     module Questions
       extend self
 
-      def which_slug?
+      def which_slug?(api_token, basepath)
         puts
         HighLine.new.choose do |menu|
           menu.prompt = "Which tenant do you want to add? "
-          available_slugs.each do |tenant_slug|
+          available_slugs(api_token, basepath).each do |tenant_slug|
             menu.choice(tenant_slug) { tenant_slug }
           end
         end
@@ -15,8 +15,8 @@ module Zapnito
 
       private
 
-      def available_slugs
-        tenant_slugs = Services.zapnito.tenant_slugs
+      def available_slugs(api_token, basepath)
+        tenant_slugs = Services.zapnito(api_token, basepath).tenant_slugs
         existing_slugs = Services.local.tenant_slugs
         tenant_slugs - existing_slugs
       end

data/lib/zapnito/cli/services.rb

@@ -7,8 +7,8 @@ module Zapnito
         @local ||= Local.new
       end
 
-      def zapnito
-        @zapnito ||= Zapnito.new(configatron.api_token)
+      def zapnito(api_token, basepath)
+        Zapnito.new(api_token, basepath)
       end
 
       def s3

data/lib/zapnito/cli/services/zapnito.rb

@@ -2,8 +2,9 @@ module Zapnito
   module Cli
     module Services
       class Zapnito
-        def initialize(api_token)
+        def initialize(api_token, basepath)
           @api_token = api_token
+          @basepath = basepath
         end
 
         def tenant_slugs
@@ -72,7 +73,7 @@ module Zapnito
         end
 
         def url(path)
-          "#{configatron.basepath}#{path}"
+          "#{@basepath}#{path}"
         end
       end
     end

data/lib/zapnito/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapnito-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - opsb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -280,6 +280,9 @@ files:
 - bin/setup
 - exe/zapnito
 - lib/zapnito/cli.rb
+- lib/zapnito/cli/commands/development_theme.rb
+- lib/zapnito/cli/commands/production_theme.rb
+- lib/zapnito/cli/commands/stage_theme.rb
 - lib/zapnito/cli/commands/theme.rb
 - lib/zapnito/cli/initializers/configatron.rb
 - lib/zapnito/cli/initializers/mime_types.rb