github-markdown-server 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69be47f30baf11233fbbf406bbaedd1c3cf38e50
-  data.tar.gz: 3c52501a7afc9631bce30d01937da20fe7fa14d8
+  metadata.gz: 46d8212844c1e26c454a1dbc177e856314d4faea
+  data.tar.gz: ac77d98c994fc316b248d501ecce112c7e50d4f6
 SHA512:
-  metadata.gz: dff3dd5ab3f042f055595ec68496b885c2f8e3da8287942f943d34c8a4a96c008034954d9becb15afda2bae06021903883c322e670f03453a8170a961f21c89e
-  data.tar.gz: 8a6834b4856f7f0cea24d85daf4ed038db6455138c2f4fea16db755e074fce259e8130fc7d0dd2fa583a8a8558ad4243c180ccdf3f18ceb48d0707e4668b9eb1
+  metadata.gz: 8467a29d2a597c14aaa255f84f58bada09f62f903b2abe8968abe3aca9b7c377f891813cda89a51e3eb2801bf837bb284e94555e668e9146f0919e321ce69edd
+  data.tar.gz: f2b06d12b46c7fcb17221df5aac8e770ae748252cfb98aad512cbb3888a0879f54f462f79f099bc72c9358bd5e025b90e05addb6a9c810bc663b33246582de0f

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
-  - "1.9"
   - "2.0"
   - "2.1"
+  - "2.2"
+
+before_install:
+  - gem install bundler

data/Makefile

@@ -0,0 +1,8 @@
+release: contrib/github-markdown-server.el
+	gem build github-markdown-server.gemspec
+	export VERSION=$(shell ./bin/github-markdown-server --version | cut -d ' ' -f 3); \
+	gem install github-markdown-server-$$VERSION.gem; \
+	gem push github-markdown-server-$$VERSION.gem
+
+contrib/github-markdown-server.el: ~/Library/emacs/lisp/github-markdown-server.el
+	\cp -fv $< $@

data/README.md

@@ -35,15 +35,3 @@ There is a [contrib](contrib/) directory with an emacs lisp file which will star
 ## Contributing
 
 Please feel free to send me pull requests! This is my first Ruby project and it always feels like my first time when I write Emacs Lisp.
-
-## Building
-
-I keep forgetting how to do this...
-
-```bash
-VERSION=$(./bin/github-markdown-server --version | cut -d ' ' -f 3)
-\cp -fv ~/Library/emacs/lisp/github-markdown-server.el ~/mysrc/github-markdown-server/contrib/github-markdown-server.el
-gem build github-markdown-server.gemspec
-gem install github-markdown-server-$VERSION.gem
-gem push github-markdown-server-$VERSION.gem
-```

data/contrib/github-markdown-server.el

@@ -13,6 +13,8 @@
 
 (require 'cl-lib)
 
+(autoload 'rvm-use-default "rvm" nil t)
+
 (defvar github-markdown-servers '() "The servers we have running.")
 (defvar github-markdown-server-port 7494 "The next available server port.")
 
@@ -30,6 +32,8 @@
 
 (defun github-markdown-server-start (directory port file-name)
   "Start a github-markdown-server for DIRECTORY on PORT and open FILE-NAME."
+  (rvm-use-default)
+  (setenv "LANG" "en_US.UTF-8")
   (let ((cmd (concat
                "github-markdown-server"
                " --directory=" (shell-quote-argument directory)
@@ -66,7 +70,7 @@ START-COMMAND the command to start a server."
                   (concat "lsof -n -i4TCP:" (number-to-string (cdr server)) " | grep LISTEN")))
               (> (length server-running) 0)))
         (progn
-          (message "reusing server")
+          (message (concat "reusing server"  (prin1-to-string (funcall path-name-fixer file-name (substring file-name (length (car server)))))))
           (call-process-shell-command
             (concat "open "
               (shell-quote-argument
@@ -96,19 +100,20 @@ START-COMMAND the command to start a server."
     (with-temp-buffer
       (insert-file-contents file-name)
       (goto-char (point-min))
-      (if (= (search-forward-regexp "^---" 6 't) 4)
-        (progn
-          (goto-char (+ (point-min) 3))
-          (if (search-forward-regexp "^---" (point-max) 't)
-            (let ((bound (point)))
-              (goto-char (point-min))
-              (if (search-forward-regexp "^permalink: \\(.*\\)$" bound 't)
-                (setq path-name (match-string 1)))))))))
+      (let ((start (search-forward-regexp "^---" 6 't)))
+        (if (and start (= start 4))
+          (progn
+            (goto-char (+ (point-min) 3))
+            (if (search-forward-regexp "^---" (point-max) 't)
+              (let ((bound (point)))
+                (goto-char (point-min))
+                (if (search-forward-regexp "^permalink: \\(.*\\)$" bound 't)
+                  (setq path-name (match-string 1))))))))))
   path-name)
 
 (defun jekyll-fix-path-name (file-name path-name)
   "Work out the pathname that FILE-NAME will be served at (PATH-NAME is our best guess right now)."
-  (setq path-name (replace-regexp-in-string "\\.md$" ".html" path-name))
+  (setq path-name (file-name-sans-extension path-name))
   (jekyll-get-permalink-from-file file-name
     (cond
       ((string-match "^/_posts/\\([0-9][0-9][0-9][0-9]\\)-\\([0-9][0-9]\\)-[0-9][0-9]-\\(.*\\)" path-name)
@@ -118,7 +123,6 @@ START-COMMAND the command to start a server."
 
 (defun jekyll-server-start (directory port file-name)
   "Start a Jekyll server for DIRECTORY on PORT and open FILE-NAME."
-  (require 'rvm)
   (rvm-use-default)
   (let* (
           (url (concat "http://localhost:" (number-to-string port)
@@ -170,12 +174,12 @@ Prefix arg \[universal-argument] to not run local server and open on github or v
           "$p = `git -C $d rev-parse --show-prefix`; "
           "chomp($o, $p); "
           "if ($o) { print \"$o/blob/master/$p$b\"; } else { print \"file://$f\" }' "
-          (shell-quote-argument (buffer-file-name)) ")#L"
+          (shell-quote-argument (buffer-file-name)) ")"
           (if (region-active-p)
-            (concat
-              (number-to-string (line-number-at-pos (region-beginning))) "-"
-              (number-to-string (line-number-at-pos (region-end))))
-            (number-to-string (line-number-at-pos)))
+            (concat "#L"
+              (number-to-string (line-number-at-pos (region-beginning))) "-L"
+              (number-to-string (line-number-at-pos (- (region-end) 1) )))
+            (if (> (line-number-at-pos) 1) (concat "#L" (number-to-string (line-number-at-pos))) ""))
           "\"")
         nil 0))))
 

data/github-markdown-server.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |s|
   s.description = %q{Runs a webserver to preview Github markdown with live.js updating.}
   s.license     = 'MIT'
 
-  s.add_dependency 'github-markdown-preview', '~> 3.1', '>= 3.1.3'
+  s.add_dependency 'github-markdown-preview', '~> 4.0'
+  s.add_dependency 'github-linguist', '~> 3.3'
+  s.add_dependency 'rugged', '~> 0.23'
 
   s.add_development_dependency 'minitest', '~> 5.4'
   s.add_development_dependency 'bundler', '~> 1.7'

data/lib/github-markdown-server/version.rb

@@ -1,3 +1,3 @@
 module GithubMarkdownServer
-  VERSION = '0.0.5'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markdown-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Alex K (wtwf.com)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markdown-preview
@@ -16,20 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: github-linguist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +105,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - bin/github-markdown-server