radius-toolbelt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739cc1fd7237fb68e676015051b31dff609200b1
-  data.tar.gz: b88f3a9ebeb1d7f06abaa9ebeb42dee46f9b7e06
+  metadata.gz: c692c22671f2daba30256e32933bf1ece3571bce
+  data.tar.gz: ad64f7506054da040eba5590d84359ad54e63592
 SHA512:
-  metadata.gz: 5d0129648e17104255135603c49f92674e57ece30e7d1f78abe052695b459a9eb6bb020aaafd8da36a04a695ddf6c412fee0b44e8b94025f399e6ba38897d77a
-  data.tar.gz: 237aef86d40e09684eb6c9d846388a76220e43efb2f2c21610e4817378da52b6c8a99f2d03e3613a476285db095fb7a5603bb707db5bb43579e5e61138c4b609
+  metadata.gz: 726761243b91de736cf5fc668f43037e2cb87cd15b47dc44f84a1413726370f03783a3f777c07a0b1c3f3d7077f5e9256a69f02297da32613c677598954220fa
+  data.tar.gz: 046da303794d6ef8d24320e10c1f7cb8d645dcb4218e4fc236b9629f6c2a3df3633d781d12c81f4fc523d3ae59115e6fe3a655588c20c19b041ce58b3f3a6810

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.4.2

data/lib/radius/toolbelt/release_github.rb

@@ -5,7 +5,6 @@ require 'launchy'
 
 module Radius
   module Toolbelt
-
     class ReleaseGithub
 
       attr_reader :repo, :tag_name, :release_name, :body, :filenames, :token
@@ -19,8 +18,6 @@ module Radius
       end
 
       def run
-        # pull token from ENV or hub config
-
         puts "\nCreating draft release \"#{release_name}\" for repo \"#{repo}\"..."
         # create the release
         client = Octokit::Client.new(access_token: token)
@@ -39,11 +36,11 @@ module Radius
         end
 
         puts "\nRelease URL: #{release.html_url}"
-        Launchy.open( release.html_url.gsub("/tag/", "/edit/") )
+        edit_url = release.html_url.gsub("/tag/", "/edit/")
+        if block_given?
+          yield({edit_url: edit_url})
+        end
       end
-
     end
-
-
   end
 end

data/lib/radius/toolbelt/release_helpers.rb

@@ -3,10 +3,27 @@ require 'fileutils'
 module Radius
   module Toolbelt
     module ReleaseHelpers
+      def validate_clean_git!
+        fail "There are uncommitted changes in git" unless system("git diff-files --quiet")
+      end
+
+      def validate_version_for_repo!(repo)
+        ver = `cd #{repo} && agvtool what-version -terse`.chomp
+        puts "Validating matching version for #{repo}: #{ver}"
+        fail "Versions do not match (version file: #{ver} #{repo} version: #{sanitized_version}" unless (ver == sanitized_version)
+      end
+
+      def current_version
+        @current_version ||= File.read("VERSION").chomp
+      end
+
+      def sanitized_version
+        @sanitized_version ||= /([0-9\.]+)/.match(current_version)[0]
+      end
 
       def tag_version(ver)
-        unless system("git tag v#{agvtool_version}")
-          fail "Error: the tag v#{agvtool_version} already exists on this repo."
+        unless system("git tag v#{ver}")
+          fail "Error: the tag v#{ver} already exists on this repo."
         end
       end
 
@@ -15,7 +32,7 @@ module Radius
       end
 
       def github_token
-        @token ||= ENV["github_token"] || YAML.load(`cat ~/.config/hub`)["github.com"].first["oauth_token"]
+        @token ||= ENV["GITHUB_TOKEN"] || YAML.load(`cat ~/.config/hub`)["github.com"].first["oauth_token"]
       end
 
       def clean(dir)
@@ -23,7 +40,18 @@ module Radius
         rm_rf Dir.glob("#{dir}/*.zip")
       end
 
-      def release_github(repo, release_name, version, files)
+      # Clone down the `repo`, copy all the `file` over then commit, tag and push
+      # it up to the origin.
+      #
+      # `files` is an array of files to copy into the root of the local repo.
+      def release_repo(repo, version, dir, files)
+        dir = File.join "build", File.basename(repo)
+        r = ReleaseRepo.new repo, version, dir, files
+        r.run
+      end
+
+
+      def release_github(repo, release_name, version, files, &block)
         tag_name = "v#{version}"
         body = <<EOF
 Bug Fixes:
@@ -41,16 +69,7 @@ EOF
         token = github_token
 
         r = ReleaseGithub.new repo, token, tag_name, release_name, body, files
-        r.run
-      end
-
-      # Clone down the `repo`, copy all the `file` over then commit, tag and push
-      # it up to the origin.
-      #
-      # `files` is an array of files to copy into the root of the local repo.
-      def release_repo(repo, version, files, dir = "build/release-repo")
-        r = ReleaseRepo.new repo, version, dir, files
-        r.run
+        r.run(&block)
       end
 
     end

data/lib/radius/toolbelt/release_repo.rb

@@ -45,8 +45,8 @@ module Radius
         FileUtils.chdir dir do
           sh "git add ."
           sh "git commit -m 'Version #{ver}'"
-          sh "git tag v#{ver}"
-          sh "git push origin master --tags"
+          sh "git tag --force v#{ver}"
+          sh "git push --force origin v#{ver}"
         end
       end
     end

data/lib/radius/toolbelt/slack_helpers.rb

@@ -0,0 +1,28 @@
+
+module Radius
+  module Toolbelt
+    module SlackHelpers
+      def slack(message, channel = nil)
+        uri = URI(ENV['SLACK_WEBHOOK_URL'])
+
+        parms = {
+          text: message,
+          username: "Travis CI",
+          icon_emoji: ":travis:"
+        }
+
+        parms[:channel] = channel if channel
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request.body = parms.to_json
+
+        http.request(request)
+      end
+      module_function :slack
+
+    end
+  end
+end

data/lib/radius/toolbelt/tasks.rb

@@ -1,6 +1,7 @@
 # Main hook for loading various Rake tasks
 require 'rake'
 require_relative 'release_helpers'
+require_relative 'slack_helpers'
 require_relative 'xcode_helpers'
 require_relative 'release_repo'
 require_relative 'release_github'
@@ -27,17 +28,3 @@ namespace :git do
   end
 end
 
-namespace :version do
-  desc "Bump the version to the next patch number"
-  task :bump do
-    sh "agvtool next-version -increment-minor-version"
-  end
-
-  desc "Set the version to a specific version number"
-  task :set, [:version] do |t, args|
-    v = args[:version]
-    fail "Error: no version specified" unless v
-
-    sh "xcrun agvtool new-version #{v}"
-  end
-end

data/lib/radius/toolbelt/version.rb

@@ -1,5 +1,5 @@
 module Radius
   module Toolbelt
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/radius/toolbelt/xcode_helpers.rb

@@ -7,21 +7,54 @@ module Radius
       def self.included klass
         klass.class_eval do
           include ReleaseHelpers
+          include SlackHelpers
         end
       end
 
       def compress(src, dest)
-        system "ditto -ck --rsrc --sequesterRsrc --keepParent #{src} #{dest}"
+        sh "ditto -ck --rsrc --sequesterRsrc --keepParent #{src} #{dest}"
       end
 
-      def xcode(action, params)
-        system "xcodebuild #{params.map {|k,v| "-#{k} #{v}"}.join ' '} #{action}"
+      def xcodebuild(args, pretty=true)
+        output_dir = File.expand_path("./build")
+        cmd = "xcodebuild #{args} UNIVERSAL_OUTPUT_DIR=#{output_dir} CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY='' #{ "| ./bin/xcpretty" if pretty }"
+        puts cmd
+        sh cmd
       end
 
-      def agvtool_version
-        @agvtool_version ||= `xcrun agvtool what-version -terse`.chomp
+      def schemes
+        schemes = `xcodebuild -workspace Monsters.xcworkspace -list`
+        schemes.each_line.map { |l| l.strip if l[/^        /]}.compact
       end
 
+      def agvtool(repo = ".")
+        `cd #{repo} && xcrun agvtool what-version -terse`.strip
+      end
+
+
+      def appledoc(name, framework, repo)
+          sh <<-EOF
+            ./bin/appledoc \
+              --output "build/#{framework}Docs" \
+              --create-html  \
+              --no-create-docset \
+              --project-name "#{name}" \
+              --project-company "Radius Networks" \
+              --project-version #{agvtool repo} \
+              --company-id "com.radiusnetworks.#{framework}" \
+              --exit-threshold 2 \
+              "./build/#{framework}.framework/Headers"
+          EOF
+      end
+
+      #def xcode(action, params)
+      #  system "xcodebuild #{params.map {|k,v| "-#{k} #{v}"}.join ' '} #{action}"
+      #end
+
+      #def agvtool_version
+      #  @agvtool_version ||= `xcrun agvtool what-version -terse`.chomp
+      #end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radius-toolbelt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Radius Networks
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -117,6 +117,7 @@ files:
 - lib/radius/toolbelt/release_github.rb
 - lib/radius/toolbelt/release_helpers.rb
 - lib/radius/toolbelt/release_repo.rb
+- lib/radius/toolbelt/slack_helpers.rb
 - lib/radius/toolbelt/tasks.rb
 - lib/radius/toolbelt/version.rb
 - lib/radius/toolbelt/xcode_helpers.rb
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Radius Networks Tools and Utilities
@@ -154,4 +155,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/string.rb
 - spec/support/subcommand.rb
-has_rdoc: