sem 0.2.3 → 0.2.4

data/lib/sem/views/shared_configs.rb

@@ -1,21 +1,19 @@
 class Sem::Views::SharedConfigs < Sem::Views::Base
 
-  def self.list(configs)
-    if configs.empty?
-      puts "You don't have any shared configurations on Semaphore."
-      puts ""
-      puts "Create your first shared configuration:"
-      puts ""
-      puts "  sem shared-config:create ORG_NAME/SHARED_CONFIG"
-      puts ""
-
-      return
-    end
+  def self.setup_first_shared_config
+    puts "You don't have any shared configurations on Semaphore."
+    puts ""
+    puts "Create your first shared configuration:"
+    puts ""
+    puts "  sem shared-config:create SHARED_CONFIG_NAME"
+    puts ""
+  end
 
+  def self.list(configs)
     header = ["ID", "NAME", "CONFIG FILES", "ENV VARS"]
 
     body = configs.map do |config|
-      [config[:id], srn_name(config), config[:config_files], config[:env_vars]]
+      [config.id, config.full_name, config.files.count, config.env_vars.count]
     end
 
     print_table [header, *body]
@@ -23,17 +21,31 @@ class Sem::Views::SharedConfigs < Sem::Views::Base
 
   def self.info(config)
     print_table [
-      ["ID", config[:id]],
-      ["Name", srn_name(config)],
-      ["Config Files", config[:config_files].to_s],
-      ["Environment Variables", config[:env_vars].to_s],
-      ["Created", config[:created_at]],
-      ["Updated", config[:updated_at]]
+      ["ID", config.id],
+      ["Name", config.full_name],
+      ["Config Files", config.files.count.to_s],
+      ["Environment Variables", config.env_vars.count.to_s],
+      ["Created", config.created_at],
+      ["Updated", config.updated_at]
     ]
   end
 
-  def self.srn_name(config)
-    "#{config[:org]}/#{config[:name]}"
+  def self.add_first_file(shared_config)
+    puts "You don't have any files in this shared configuration."
+    puts ""
+    puts "Add your first file:"
+    puts ""
+    puts "  sem shared-config:files:add #{shared_config.full_name} --local-path <file> --path-on-semaphore <path>"
+    puts ""
+  end
+
+  def self.add_first_env_var(shared_config)
+    puts "You don't have any environment variable in this shared configuration."
+    puts ""
+    puts "Add your first environment variable:"
+    puts ""
+    puts "  sem shared-config:env-vars:add #{shared_config.full_name} --local-path <file> --path-on-semaphore <path>"
+    puts ""
   end
 
 end

data/lib/sem/views/teams.rb

@@ -1,76 +1,58 @@
 class Sem::Views::Teams < Sem::Views::Base
-  class << self
-    def list(teams)
-      if teams.empty?
-        puts "You don't have any teams on Semaphore."
-        puts ""
-        puts "Create your first team:"
-        puts ""
-        puts "  sem teams:create ORG_NAME/TEAM"
-        puts ""
-
-        return
-      end
-
-      header = ["ID", "NAME", "PERMISSION", "MEMBERS"]
-
-      body = teams.map do |team|
-        [team[:id], "#{team[:org]}/#{team[:name]}", permission(team), "#{team[:members]} members"]
-      end
-
-      print_table [header, *body]
-    end
-
-    def info(team)
-      print_table [
-        ["ID", team[:id]],
-        ["Name", name(team)],
-        ["Permission", permission(team)],
-        ["Members", members(team)],
-        ["Created", team[:created_at]],
-        ["Updated", team[:updated_at]]
-      ]
-    end
-
-    def list_members(team, members)
-      if members.empty?
-        puts "You don't have any members in the team."
-        puts ""
-        puts "Add your first member:"
-        puts ""
-        puts "  sem teams:members:add #{team} USERNAME"
-        puts ""
-
-        return
-      end
-
-      header = ["NAME"]
+  def self.create_first_team
+    puts "You don't have any teams on Semaphore."
+    puts ""
+    puts "Create your first team:"
+    puts ""
+    puts "  sem teams:create ORG_NAME/TEAM"
+    puts ""
+  end
 
-      body = members.map do |user|
-        [user[:id]]
-      end
+  def self.list(teams)
+    header = ["ID", "NAME", "PERMISSION", "MEMBERS"]
 
-      print_table [header, *body]
+    body = teams.map do |team|
+      [team.id, team.full_name, team.permission, "#{team.users.count} members"]
     end
 
-    private
-
-    def name(team)
-      return unless team[:org] && team[:name]
-
-      "#{team[:org]}/#{team[:name]}"
-    end
+    print_table [header, *body]
+  end
 
-    def members(team)
-      return unless team[:members]
+  def self.info(team)
+    print_table [
+      ["ID", team.id],
+      ["Name", team.full_name],
+      ["Permission", team.permission],
+      ["Members", team.users.count.to_s],
+      ["Created", team.created_at],
+      ["Updated", team.updated_at]
+    ]
+  end
 
-      "#{team[:members]} members"
-    end
+  def self.add_first_team_member(team)
+    puts "You don't have any members in the team."
+    puts ""
+    puts "Add your first member:"
+    puts ""
+    puts "  sem teams:members:add #{team.full_name} USERNAME"
+    puts ""
+  end
 
-    def permission(team)
-      return "write" if team[:permission] == "edit"
+  def self.add_first_project(team)
+    puts "You don't have any projects in this team."
+    puts ""
+    puts "Add your first project:"
+    puts ""
+    puts "  sem teams:projects:add #{team.full_name} PROJECT_NAME"
+    puts ""
+  end
 
-      team[:permission]
-    end
+  def self.add_first_shared_config(team)
+    puts "You don't have any shared configurations in this team."
+    puts ""
+    puts "Add your first shared configuration:"
+    puts ""
+    puts "  sem teams:shared-configs:add #{team.full_name} SHARED_CONFIG_NAME"
+    puts ""
   end
 end

data/lib/sem/views/users.rb

@@ -1,11 +1,11 @@
 class Sem::Views::Users < Sem::Views::Base
-  class << self
-    def list(users)
-      header = ["NAME"]
+  def self.list(users)
+    header = ["NAME"]
 
-      body = users.map { |user| [user[:id]] }
-
-      print_table [header, *body]
+    body = users.map do |user|
+      [user.username]
     end
+
+    print_table [header, *body]
   end
 end

data/lib/sem.rb

@@ -3,6 +3,7 @@ require "dracula"
 require "semaphore_client"
 require "fileutils"
 require "pmap"
+require "delegate"
 
 module Sem
   require "sem/errors"
@@ -33,6 +34,10 @@ module Sem
       Sem::CLI.start(args)
 
       0
+    rescue Sem::Errors::ResourceNotFound => e
+      puts e.message
+
+      1
     rescue Sem::Errors::ResourceException => e
       puts e.message
 

data/sem.gemspec

@@ -32,4 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rspec", "1.5.0"
   spec.add_development_dependency "simplecov", "~> 0.13"
   spec.add_development_dependency "byebug", "~> 9.0.0"
+
+  # lock down version to support ruby 2.0
+  spec.add_development_dependency "public_suffix", "~> 2.0.5"
+  spec.add_development_dependency "webmock", "~> 3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sem
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Igor Šarčević
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semaphore_client
@@ -28,84 +28,84 @@ dependencies:
   name: dracula
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: pmap
   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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.47.1
 - !ruby/object:Gem::Dependency
@@ -126,30 +126,58 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 9.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 9.0.0
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description: Semaphore CLI
 email:
 - igor@renderedtext.com
@@ -158,9 +186,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -172,18 +200,13 @@ files:
 - lib/sem.rb
 - lib/sem/api.rb
 - lib/sem/api/base.rb
-- lib/sem/api/env_vars.rb
-- lib/sem/api/files.rb
-- lib/sem/api/orgs.rb
-- lib/sem/api/projects.rb
-- lib/sem/api/shared_configs.rb
-- lib/sem/api/teams.rb
-- lib/sem/api/traits.rb
-- lib/sem/api/traits/associated_with_org.rb
-- lib/sem/api/traits/associated_with_project.rb
-- lib/sem/api/traits/associated_with_shared_config.rb
-- lib/sem/api/traits/associated_with_team.rb
-- lib/sem/api/users.rb
+- lib/sem/api/env_var.rb
+- lib/sem/api/file.rb
+- lib/sem/api/org.rb
+- lib/sem/api/project.rb
+- lib/sem/api/shared_config.rb
+- lib/sem/api/team.rb
+- lib/sem/api/user.rb
 - lib/sem/cli.rb
 - lib/sem/cli/orgs.rb
 - lib/sem/cli/projects.rb
@@ -214,17 +237,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Semaphore CLI

data/lib/sem/api/env_vars.rb

@@ -1,22 +0,0 @@
-module Sem
-  module API
-    class EnvVars < Base
-      extend Traits::AssociatedWithSharedConfig
-
-      class << self
-        def api
-          client.env_vars
-        end
-
-        def to_hash(env_var)
-          {
-            :id => env_var.id,
-            :name => env_var.name,
-            :encrypted? => env_var.encrypted,
-            :content => env_var.content
-          }
-        end
-      end
-    end
-  end
-end

data/lib/sem/api/files.rb

@@ -1,21 +0,0 @@
-module Sem
-  module API
-    class Files < Base
-      extend Traits::AssociatedWithSharedConfig
-
-      class << self
-        def api
-          client.config_files
-        end
-
-        def to_hash(file)
-          {
-            :id => file.id,
-            :name => file.path,
-            :encrypted? => file.encrypted
-          }
-        end
-      end
-    end
-  end
-end

data/lib/sem/api/orgs.rb

@@ -1,42 +0,0 @@
-module Sem
-  module API
-    class Orgs < Base
-      class << self
-        def list
-          orgs = api.list
-
-          orgs.to_a.map { |org| to_hash(org) }
-        end
-
-        def info(name)
-          org = api.get(name)
-
-          raise Sem::Errors::ResourceNotFound.new("Organization", [name]) if org.nil?
-
-          to_hash(org)
-        end
-
-        def list_teams(name)
-          Sem::API::Teams.list_for_org(name)
-        end
-
-        def list_users(name)
-          Sem::API::Users.list_for_org(name)
-        end
-
-        def api
-          client.orgs
-        end
-
-        def to_hash(org)
-          {
-            :id => org.id,
-            :username => org.username,
-            :created_at => org.created_at,
-            :updated_at => org.updated_at
-          }
-        end
-      end
-    end
-  end
-end

data/lib/sem/api/projects.rb

@@ -1,42 +0,0 @@
-module Sem
-  module API
-    class Projects < Base
-      extend Traits::AssociatedWithOrg
-      extend Traits::AssociatedWithTeam
-
-      class << self
-        def name_to_id(org_name, project_name)
-          info(org_name, project_name)[:id]
-        end
-
-        def list
-          org_names = Orgs.list.map { |org| org[:username] }
-
-          org_names.to_a.pmap { |name| list_for_org(name) }.flatten
-        end
-
-        def info(org_name, project_name)
-          project = api.list_for_org(org_name, :name => project_name).first
-
-          raise Sem::Errors::ResourceNotFound.new("Project", [org_name, project_name]) if project.nil?
-
-          to_hash(project, org_name)
-        end
-
-        def api
-          client.projects
-        end
-
-        def to_hash(project, org)
-          {
-            :id => project.id,
-            :name => project.name,
-            :org => org,
-            :created_at => project.created_at,
-            :updated_at => project.updated_at
-          }
-        end
-      end
-    end
-  end
-end