shaman_cli 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c94de0c331acc16e159a2ac54c831bd45298972c
-  data.tar.gz: 12fbbb3dbe8f549a221c1c093c565f93fbe5cfd7
+  metadata.gz: 6a25a911038c45c59969494d203ca6672179854c
+  data.tar.gz: 26d4a1e794af5a4c5d6da95e65eb14cc5254ea30
 SHA512:
-  metadata.gz: 155947f05c8cf1fab49c16186aca4655b9271f1f5ba7ee0d82dd7520f7a7bacac25649f2a48730841ccdfd4149e4e4e8d3ac8778837014d98b3b3f6081549034
-  data.tar.gz: 35132213066621f4f1b430044f04b4c8ec85ffea563e32dfed5dcf46f824a44114eea75817a6ae30bea900a188692bac2e248a8082f913da1de4e56c841c7f43
+  metadata.gz: 8c0cf5361790fa1bb29fd5c63767d13321210150e257ac27a7748b96330d3b949a3fc6037bef4da87488abe56733d18836d0803b1d54f5d8738f85695ff10d4b
+  data.tar.gz: 987d568b08228361b4a089cfaff8e38e362849407fbaf8d4c3061689a3fecb59db2505cad10208b5aa0c78ab4474693a494345757ed2f98327b177d4bf230162

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/shaman_cli.svg)](https://badge.fury.io/rb/shaman_cli)
+
 # Shaman
 
 Cli for integrating with labs.infinum.co
@@ -8,6 +10,10 @@ Install it yourself as:
 
     $ gem install shaman
 
+Get your user token from `https://labs.infinum.co/users/me` and export it to environment variable `SHAMAN_TOKEN`
+
+    export SHAMAN_TOKEN=infnweoinfwi32r23jr2309j
+
 ## Usage
 
 ### Init
@@ -17,24 +23,23 @@ Install it yourself as:
     Initialize your project
 
     Options:
-      -f, --file FILE      Application file path
-      -t, --token TOKEN    Environment token
-      -u, --user EMAIL     Labs user email
+      -s, --search STRING  Shrink project selection
+      -f, --favorites      Show only favorites
+      -p, --platform PLATFORM Choose platform
+      -i, --project_id PROJECT Choose project id
 
 Example of `.shaman.yml`
 
-    ---
-    :release_path: spec/files/test.ipa
-    :environment_token: ZNkyGVgbnwMEU3L2Gx64o22h
-    :deployer_email: stjepan.hadjic@infinum.hr
+      ---
+      production:
+        :release_path: spec/files/test.ipa
+        :token: Hu6vuqgEF3FzrmenDQ1kk86R
+
 
 Explanation:
 
-`release_path`      - this is the path to the release file
-`environment_token` - This is a token you can find
-[https://scr.infinum.co/stjepan_hadjic/Infinum_Labs_2016-02-23_17-14-08.png]
-`deployer_email`    - This is an email you use with your git commits. You will also need to add this to your labs account.
-[https://scr.infinum.co/stjepan_hadjic/Infinum_Labs_2016-02-23_17-16-52.png]
+`release_path`      - this is the path to the release file  
+`token`             - This is the environment token for communicating with API
 
 ### Deploy
 
@@ -42,28 +47,19 @@ This will deploy your relese file to labs with with configs from .shaman.yml
 
     $ shaman deploy
 
+    $ shaman deploy [environment]
+
+    Deploy a release to specified environment
+
     Options:
       -m, --message MESSAGE Changelog message
       -f, --file FILE      Release path
-      -p, --proguard FILE  Add aditional proguard mapping
-      -t, --token TOKEN    Use different environment token
+      -t, --token TOKEN    Use different user token
       -c, --config FILE    Use different config file
-      -d, --deployer EMAIL Labs deployer email
-      -g, --git            Use git for deployer email and message (overrides any manual settings!)
+      -g, --git            Use git for message (overrides any manual settings!)
       -C, --commit COMMIT  which commit to use instead of HEAD
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/shaman. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
-
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/exe/shaman

@@ -1,40 +1,40 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << 'lib'
 require 'rubygems'
 require 'commander/import'
 require 'shaman'
-# require 'pry'
+require 'pry' if ENV['SHAMAN_ENV'] == 'development'
 
 program :version, Shaman::VERSION
 program :description, 'Shaman cli for labs'
 program :help_formatter, :compact
 
 command :init do |c|
-  c.syntax = 'shaman init [-f] [-t]'
-  c.description = 'Initialize your project'
-  c.option '-f', '--file FILE', String, 'Application file path'
-  c.option '-t', '--token TOKEN', String, 'Environment token'
-  c.option '-u', '--user EMAIL', String, 'Labs user email'
+  c.syntax = 'shaman init'
+  c.description = 'Initialize your'
+  c.option '-s', '--search STRING', String, 'Shrink project selection'
+  c.option '-f', '--favorites', 'Show only favorites'
+  c.option '-p', '--platform PLATFORM', 'Choose platform'
+  c.option '-i', '--project_id PROJECT', 'Choose project id'
   c.action do |_args, options|
+    Shaman::Init.check
     Shaman::Init.init(options)
   end
 end
 
 command :deploy do |c|
-  c.syntax = 'shaman deploy'
-  c.description = 'Deploy a release'
+  c.syntax = 'shaman deploy [environment]'
+  c.description = 'Deploy a release to specified environment'
   c.option '-m', '--message MESSAGE', String, 'Changelog message'
   c.option '-f', '--file FILE', String, 'Release path'
   c.option '-p', '--proguard FILE', String, 'Add aditional proguard mapping'
-  c.option '-t', '--token TOKEN', String, 'Use different environment token'
+  c.option '-t', '--token TOKEN', String, 'Use different user token'
   c.option '-c', '--config FILE', String, 'Use different config file'
-  c.option '-d', '--deployer EMAIL', String, 'Labs deployer email'
-  c.option '-g', '--git', 'Use git for deployer email and message (overrides any manual settings!)'
+  c.option '-g', '--git', 'Use git for message (overrides any manual settings!)'
   c.option '-C', '--commit COMMIT', String, 'which commit to use instead of HEAD'
-  c.action do |_args, options|
+  c.action do |args, options|
     begin
-      Shaman::Deploy.new(options).deploy
+      Shaman::Deploy.new(args, options).deploy
     rescue => e
       say_error e.message
     end

data/lib/shaman/deploy.rb

@@ -1,38 +1,43 @@
 module Shaman
   class Deploy
-    attr_reader :options
+    include Helpers
 
-    def initialize(options)
+    def initialize(args, options)
+      error!('Must specify environment') if args.count != 1
+      @environment = args.first
       @options = options
       verify_options
     end
 
     def deploy
-      say_ok "Connecting to #{LABS_URL}/api/v1/releases"
-      say_ok "Sending #{deploy_options.to_yaml}"
+      prompt.ok "Connecting to #{LABS_URL}/api/v1/releases"
       response = HTTP.post("#{LABS_URL}/api/v1/releases", form: deploy_options)
-      response.code == 200 ? say_ok(response.body.to_s) : say_error(response.body.to_s)
+      response.code == 200 ? prompt.ok(response.body.to_s) : prompt.error(response.body.to_s)
     end
 
     private
 
+    attr_reader :environment, :options
+
     def deploy_options
+      raise 'Wrong environment' if config.nil?
       @deploy_options ||= {
-        environment_token: options.token || config[:environment_token],
+        environment_token: config[:token],
         release: HTTP::FormData::File.new(options.file || config[:release_path]),
         message: message || '',
-        deployer: deployer
+        token: options.token || ENV['SHAMAN_TOKEN']
       }
     end
 
     def verify_options
       deploy_options.each do |key, value|
-        fail "Please specify #{key}" if value.nil?
+        raise "Please specify #{key}" if value.nil?
       end
     end
 
     def config
-      @config ||= YAML.load_file(options.config || PROJECT_CONFIG_PATH)
+      @config ||=
+        YAML.load_file(options.config || PROJECT_CONFIG_PATH)[environment]
     end
 
     def gcommit
@@ -42,9 +47,5 @@ module Shaman
     def message
       options.git ? gcommit.message : options.message || ask_editor(nil, 'vi')
     end
-
-    def deployer
-      options.git ? gcommit.committer.email : options.deployer || config[:deployer_email]
-    end
   end
 end

data/lib/shaman/helpers.rb

@@ -0,0 +1,12 @@
+module Shaman
+  module Helpers
+    def prompt
+      @prompt ||= TTY::Prompt.new
+    end
+
+    def error!(msg)
+      prompt.error(msg)
+      exit(-1)
+    end
+  end
+end

data/lib/shaman/init.rb

@@ -1,13 +1,85 @@
 module Shaman
-  module Init
+  class Init
+    include Shaman::Helpers
+
+    def self.check
+      return unless ENV['SHAMAN_TOKEN'].nil?
+      error! "SHAMAN_TOKEN not defined. Please find it at #{LABS_URL}/me"
+    end
+
     def self.init(options)
-      config = {
-        release_path: options.file || ask('Release path:'),
-        environment_token: options.token || ask('Environment token:'),
-        deployer_email: options.user || ask('Labs deployer email:')
-      }
+      new(options).call
+    end
+
+    def initialize(options)
+      @options = options
+    end
+
+    def call
+      @platform = choose_platform if options.platform.nil?
+      @project_id = choose_project_id if options.project_id.nil?
+      write_config
+      prompt.ok '.shaman.yml created'
+      prompt.say(File.read(PROJECT_CONFIG_PATH), color: :cyan)
+    end
+
+    private
+
+    attr_reader :options
+
+    def choose_platform
+      prompt.select('Choose platform:', [:android, :ios, :zip, :air, :web])
+    end
+
+    def choose_project_id
+      prompt.enum_select('Choose project:') do |menu|
+        menu.enum '.'
+        projects.each do |project|
+          menu.choice "#{project['name']} (#{project['id']})", project['id']
+        end
+      end
+    end
+
+    def write_config
+      project = projects.detect { |p| p['id'] == project_id }
+      error!('wrong project id') if project.nil?
+      config = {}
+      project['environments'].each do |environment|
+        next unless environment['platform'] == platform.to_s
+        release_path = prompt.ask("Release path for #{environment['name']}", default: 'path/to/release')
+        config[environment['name']] = {
+          release_path: release_path,
+          token: environment['token']
+        }
+      end
       File.open(PROJECT_CONFIG_PATH, 'w') { |f| f.write(YAML.dump(config)) }
-      say_ok '.shaman.yml created'
+    end
+
+    def projects
+      return @projects if @projects
+      response = HTTP.get(
+        "#{LABS_URL}/api/v1/projects",
+        params: {
+          token: ENV['SHAMAN_TOKEN'], favorites: favorites, search: search, platform: platform
+        }
+      )
+      @projects = JSON.parse(response.body)
+    end
+
+    def favorites
+      options.favorites
+    end
+
+    def search
+      options.search
+    end
+
+    def project_id
+      @project_id || options.project_id.to_i
+    end
+
+    def platform
+      @platform || options.platform
     end
   end
 end

data/lib/shaman/version.rb

@@ -1,3 +1,3 @@
 module Shaman
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/shaman.rb

@@ -1,12 +1,14 @@
 require 'http'
 require 'git'
 require 'yaml'
+require 'tty-prompt'
+require 'shaman/helpers'
 require 'shaman/init'
 require 'shaman/deploy'
 require 'shaman/version'
 
 module Shaman
-  PROJECT_CONFIG_PATH = '.shaman.yml'
+  PROJECT_CONFIG_PATH = '.shaman.yml'.freeze
   LABS_URL =
     case ENV['SHAMAN_ENV']
     when 'development' then 'http://localhost:3000'

data/shaman.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_dependency 'http'
   spec.add_dependency 'git'
+  spec.add_dependency 'commander'
+  spec.add_dependency 'tty-prompt'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shaman_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Very cool command tool for infinum
 email:
 - d4be4st@gmail.com
@@ -115,6 +143,7 @@ files:
 - exe/shaman
 - lib/shaman.rb
 - lib/shaman/deploy.rb
+- lib/shaman/helpers.rb
 - lib/shaman/init.rb
 - lib/shaman/version.rb
 - shaman.gemspec
@@ -138,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command tool for labs
 test_files: []
-has_rdoc: