sah 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b1946117957d3bc0c54b7327114182d0604a03
-  data.tar.gz: 723bbe78ca21a25b56f34e09c8b9224b2f8996be
+  metadata.gz: df17335238e88fbccf43783368514990177ae205
+  data.tar.gz: 6391cde337e7e556bfb44d045a5cd86496c44c35
 SHA512:
-  metadata.gz: 610875901e086fe034573e7aaf9099ac370f2d82d9cbace6b43b22bf8d7e422e86079999c6ab67075f1f4e636008a0b865408fd0128581d4b3daab26a9b82c54
-  data.tar.gz: ccf2e1217e1f0a818f8bf928aaa64fcdcd963fa13658d9d976551a07d1b08cd8a7fc2cb09329420f73d9aa2d734ab7907fef8d0a050d1f77b2a2be7f6941cb41
+  metadata.gz: 10ee1527f31c4b973133b43c3c28cb68686ea73d6289510de7e58663ef123024fa6023967ea2ebf926cae8195970f0abcc9ce4942876ea048050d47578adeab8
+  data.tar.gz: 99db2c7d06eb40ed66f92f8f7fa618ffa8f6384163a1c2bcfdee7890a521181a4e645a4935bb3b2e495ed78706fe00ad8b52fd6eb63b2d7077e40856aa9abad4

data/README.md

@@ -103,6 +103,8 @@ If you use multiple stash, define profile(s) and specify it.
 - `git config --global sah.config.upstream-prevent-push true`  
   (the same as `--prevent-push` option)  
   Setting this option to true will Prevent push to upstream repository.
+- `git config --global sah.config.sah.git-protocol [ssh|http]`  
+  Setting this option to specify git protocol. (default: ssh)
 
 ### user
 

data/lib/sah/api.rb

@@ -0,0 +1,79 @@
+require "sah"
+require 'faraday'
+require 'faraday_middleware'
+
+module Sah
+  class API
+    attr_accessor :config, :conn
+
+    def initialize(config)
+      @config = config
+
+      base_url = (config.url).to_s.sub(/#{config.url.path}$/, '')
+      @conn = Faraday.new(url: base_url) do |faraday|
+        faraday.response :json
+        # faraday.response :logger
+        faraday.adapter Faraday.default_adapter
+        faraday.basic_auth config.user, config.password
+      end
+    end
+
+    def fork_repo(project, repo, name=nil)
+      body = {slug: repo}
+      body = body.merge(name: name) if name
+
+      @conn.post do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos/#{repo}"
+        req.headers['Content-Type'] = 'application/json'
+        req.body = body.to_json
+      end
+    end
+
+    def create_repo(project, repo)
+      @conn.post do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos"
+        req.headers['Content-Type'] = 'application/json'
+        req.body = {name: repo, scmId: "git", forkable: true}.to_json
+      end
+    end
+
+    def list_project
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects"
+        req.params['limit'] = 1000
+      end
+    end
+
+    def show_project(project)
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}"
+      end
+    end
+
+    def list_user
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/users"
+        req.params['limit'] = 1000
+      end
+    end
+
+    def show_user(user)
+       @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/users/#{user}"
+      end
+    end
+
+    def list_repository(project)
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos"
+        req.params['limit'] = 1000
+      end
+    end
+
+    def show_repository(project, repository)
+      @conn.get do |req|
+        req.url @config.url.path + "/rest/api/1.0/projects/#{project}/repos/#{repository}"
+      end
+    end
+  end
+end

data/lib/sah/cli.rb

@@ -1,112 +1,9 @@
 require "sah"
 require "thor"
-require 'faraday'
-require 'faraday_middleware'
 require 'hirb'
 require 'hirb-unicode'
 
 module Sah
-  class API
-    attr_accessor :conn
-
-    def initialize(config)
-      @conn = Faraday.new(url: config.url) do |faraday|
-        faraday.response :json
-        # faraday.response :logger
-        faraday.adapter Faraday.default_adapter
-        faraday.basic_auth config.user, config.password
-      end
-    end
-
-    def fork_repo(project, repo, name=nil)
-      body = {slug: repo}
-      body = body.merge(name: name) if name
-
-      res = @conn.post do |req|
-        req.url "/rest/api/1.0/projects/#{project}/repos/#{repo}"
-        req.headers['Content-Type'] = 'application/json'
-        req.body = body.to_json
-      end
-      if res.status != 201
-        puts res.body["errors"].first["message"]
-      end
-    end
-
-    def create_repo(project, repo)
-      res = @conn.post do |req|
-        req.url "/rest/api/1.0/projects/#{project}/repos"
-        req.headers['Content-Type'] = 'application/json'
-        req.body = {name: repo, scmId: "git", forkable: true}.to_json
-      end
-      if res.status != 201
-        puts res.body["errors"].first["message"]
-      end
-    end
-
-    def list_project
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/projects"
-        req.params['limit'] = 1000
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      res.body["values"].sort_by{|e| e["id"].to_i }
-    end
-
-    def show_project(project)
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/projects/#{project}"
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      res.body
-    end
-
-    def list_user
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/users"
-        req.params['limit'] = 1000
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      users = res.body["values"].sort_by{|e| e["id"].to_i }
-    end
-
-    def show_user(user)
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/users/#{user}"
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      res.body
-    end
-
-    def list_repository(project)
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/projects/#{project}/repos"
-        req.params['limit'] = 1000
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      repositories = (res.body["values"] || []).sort_by{|e| e["id"].to_i }
-    end
-
-    def show_repository(project, repository)
-      res = @conn.get do |req|
-        req.url "/rest/api/1.0/projects/#{project}/repos/#{repository}"
-      end
-      if res.status != 200
-        puts res.body["errors"].first["message"]
-      end
-      res.body
-    end
-  end
-
   class CLI < Thor
     class_option :profile,
       type: :string, default: (ENV["SAH_DEFAULT_PROFILE"] || :default),
@@ -123,13 +20,16 @@ module Sah
     sah clone ~USERNAME/REPO
     \x5> git clone ssh://git@example.com:7999/~USERNAME/REPO
     LONG_DESCRIPTION
-    def clone(repos)
-      repository, project = repos.split("/").reverse
-      project ||= "~#{config.user}"
-      repo_info = api.show_repository(project, repository)
-      abort if repo_info.key?("errors")
+    def clone(arg)
+      repository_slug, project_key = arg.split("/").reverse
+      project_key ||= "~#{config.user}"
+      res = api.show_repository(project_key, repository_slug)
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
+      end
+      repository = res.body
       remote_url =
-        repo_info["links"]["clone"].find{ |e| e["name"] == "ssh" }["href"]
+        repository["links"]["clone"].find{ |e| e["name"] == config.git_protocol }["href"]
       system "git", "clone", remote_url
     end
 
@@ -147,12 +47,18 @@ module Sah
     \x5# repository name is same as the current repository
     LONG_DESCRIPTION
     method_option :name, aliases: "-n", desc: "Set repository name"
-    def create(project=nil)
-      project ||= "~#{config.user}"
-      repo = (
+    def create(arg=nil)
+      project_key = (arg || "~#{config.user}")
+      repository_slug = (
         options[:name] || File.basename(`git rev-parse --show-toplevel`).chomp
       )
-      api.create_repo(project, repo)
+      res = api.create_repo(project_key, repository_slug)
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
+      end
+      remote_url =
+        res.body["links"]["clone"].find{ |e| e["name"] == config.git_protocol }["href"]
+      system "git", "remote", "add", "origin", remote_url
     end
 
     desc "fork [REPO] [--name REPO_NAME]", "Fork repository"
@@ -171,15 +77,18 @@ module Sah
     \x5# fork from ~USERNAME/REPO to ~YOUR_NAME/REPO
     LONG_DESCRIPTION
     method_option :name, aliases: "-n", desc: "Set repository name"
-    def fork(repos=nil)
-      if repos
-        project, repo = repos.split("/")
+    def fork(arg=nil)
+      if arg
+        project_key, repository_slug = arg.split("/")
       else
         remote_url = `git config --get remote.origin.url`.chomp
         remote_url.match %r%/([^/]+)/([^/]+?)(?:\.git)?$%
-        project, repo = $1, $2
+        project_key, repository_slug = $1, $2
+      end
+      res = api.fork_repo(project_key, repository_slug, options[:name])
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
       end
-      api.fork_repo(project, repo, options[:name])
     end
 
     desc "project [PROJECT]", "Show project information"
@@ -190,13 +99,21 @@ module Sah
     sah project PROJECT
     \x5# show project detail
     LONG_DESCRIPTION
-    def project(project=nil)
-      if project.nil?
-        projects = api.list_project
-        puts Hirb::Helpers::AutoTable.render(projects, fields: %w(id key name description))
-      else
-        project = api.show_project(project)
+    def project(arg=nil)
+      if arg
+        res = api.show_project(arg)
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        project = res.body
         puts Hirb::Helpers::AutoTable.render(project, headers: false)
+      else
+        res = api.list_project
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        projects = res.body["values"].sort_by{|e| e["id"].to_i }
+        puts Hirb::Helpers::AutoTable.render(projects, fields: %w(id key name description))
       end
     end
 
@@ -208,14 +125,22 @@ module Sah
     sah repository PROJECT/REPO
     \x5# show repository detail
     LONG_DESCRIPTION
-    def repository(repo)
-      project, repository = repo.split("/")
-      if repository.nil?
-        repositories = api.list_repository(project)
-        puts Hirb::Helpers::AutoTable.render(repositories, fields: %w(id slug name))
-      else
-        repository = api.show_repository(project, repository)
+    def repository(arg)
+      project_key, repository_slug = arg.split("/")
+      if repository_slug
+        res = api.show_repository(project_key, repository_slug)
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        repository = res.body
         puts Hirb::Helpers::AutoTable.render(repository, headers: false)
+      else
+        res = api.list_repository(project_key)
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        repositories = (res.body["values"] || []).sort_by{|e| e["id"].to_i }
+        puts Hirb::Helpers::AutoTable.render(repositories, fields: %w(id slug name))
       end
     end
 
@@ -235,10 +160,13 @@ module Sah
       remote_url = `git config --get remote.origin.url`.chomp
       remote_url.match %r%/([^/]+)/([^/]+?)(?:\.git)?$%
       project, repository = $1, $2
-      repo_info = api.show_repository(project, repository)
-      abort if repo_info.key?("errors")
+      res = api.show_repository(project, repository)
+      if res.body.key? "errors"
+        abort res.body["errors"].first["message"]
+      end
+      repository = res.body
       upstream_url =
-        repo_info["origin"]["links"]["clone"].find{ |e| e["name"] == "ssh" }["href"]
+        repository["origin"]["links"]["clone"].find{ |e| e["name"] == config.git_protocol }["href"]
       if options[:"add-remote"]
         system "git", "remote", "add", "upstream", upstream_url
         if config.upstream_fetch_pull_request || options[:"fetch-pull-request"]
@@ -261,13 +189,21 @@ module Sah
     sah user USER
     \x5# show user detail
     LONG_DESCRIPTION
-    def user(user=nil)
-      if user.nil?
-        users = api.list_user
-        puts Hirb::Helpers::AutoTable.render(users, fields: %w(id slug name displayName))
-      else
-        user = api.show_user(user)
+    def user(arg=nil)
+      if arg
+        res = api.show_user(arg)
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        user = res.body
         puts Hirb::Helpers::AutoTable.render(user, headers: false)
+      else
+        res = api.list_user
+        if res.body.key? "errors"
+          abort res.body["errors"].first["message"]
+        end
+        users = (res.body["values"] || []).sort_by{|e| e["id"].to_i }
+        puts Hirb::Helpers::AutoTable.render(users, fields: %w(id slug name displayName))
       end
     end
 

data/lib/sah/config.rb

@@ -1,12 +1,16 @@
+require 'uri'
+
 module Sah
   class Config
     attr_accessor :user, :password, :url,
-      :upstream_fetch_pull_request, :upstream_prevent_push
+      :upstream_fetch_pull_request, :upstream_prevent_push,
+      :git_protocol
 
     def initialize(profile)
       @user, @password, @url = nil, nil, nil
       @upstream_fetch_pull_request = false
       @upstream_prevent_push = false
+      @git_protocol = "ssh"
 
       profile_prefix = "sah\.profile\.#{profile}"
       config_prefix = "sah\.config"
@@ -18,11 +22,13 @@ module Sah
         when /#{profile_prefix}\.password (.*)$/
           @password = $1
         when /#{profile_prefix}\.url (.*)$/
-          @url = $1
+          @url = URI.parse $1
         when /#{config_prefix}\.upstream-fetch-pull-request (.*)$/
           @upstream_fetch_pull_request = ($1 == "true")
         when /#{config_prefix}\.upstream-prevent-push (.*)$/
           @upstream_prevent_push = ($1 == "true")
+        when /#{config_prefix}\.git-protocol (.*)$/
+          @git_protocol = $1
         end
       end
 

data/lib/sah/version.rb

@@ -1,3 +1,3 @@
 module Sah
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/sah.rb

@@ -1,4 +1,5 @@
 require "sah/version"
+require "sah/api"
 require "sah/cli"
 require "sah/config"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sah
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - f440
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -154,6 +154,7 @@ files:
 - bin/setup
 - exe/sah
 - lib/sah.rb
+- lib/sah/api.rb
 - lib/sah/cli.rb
 - lib/sah/config.rb
 - lib/sah/version.rb