kubo pushed to asciinema (f22). "Update to version 1.0.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 16:23:53 UTC 2015
>From 736813ecacf4cb99dcc05023859a74fddf678542 Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky at gmail.com>
Date: Tue, 24 Mar 2015 22:36:32 +0100
Subject: Update to version 1.0.0
diff --git a/.gitignore b/.gitignore
index f4ba189..0040403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
/v0.9.7.tar.gz
/v0.9.8.tar.gz
/v0.9.9.tar.gz
-/asciinema.1
+/v1.0.0.tar.gz
diff --git a/asciinema-locale.patch b/asciinema-locale.patch
new file mode 100644
index 0000000..5de5576
--- /dev/null
+++ b/asciinema-locale.patch
@@ -0,0 +1,36 @@
+From 0dc492e30a932d3f3a72d9e5ab76e0f69b3aea4c Mon Sep 17 00:00:00 2001
+From: Jakub Jedelsky <jakub.jedelsky at gooddata.com>
+Date: Mon, 23 Mar 2015 15:43:23 +0100
+Subject: [PATCH] UTF locale can be specified with utf8 too.
+
+---
+ util/locale.go | 2 +-
+ util/locale_test.go | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/util/locale.go b/util/locale.go
+index 524eba3..13fdb7d 100644
+--- a/util/locale.go
++++ b/util/locale.go
+@@ -17,5 +17,5 @@ func GetLocaleCharset(env map[string]string) string {
+
+ func IsUtf8Locale(env map[string]string) bool {
+ charset := GetLocaleCharset(env)
+- return charset == "utf-8" || charset == "UTF-8"
++ return charset == "utf-8" || charset == "UTF-8" || charset == "utf8"
+ }
+diff --git a/util/locale_test.go b/util/locale_test.go
+index a9cd61c..1f78c5b 100644
+--- a/util/locale_test.go
++++ b/util/locale_test.go
+@@ -14,6 +14,7 @@ func TestGetLocaleCharset(t *testing.T) {
+ expectedResult string
+ }{
+ {"pl_PL.UTF-8", "pl_PL.ISO-8859-1", "pl_PL.ISO-8859-2", "UTF-8"},
++ {"cz_CS.utf8", "pl_PL.ISO-8859-1", "pl_PL.ISO-8859-2", "utf8"},
+ {"", "pl_PL.ISO-8859-1", "pl_PL.ISO-8859-2", "ISO-8859-1"},
+ {"", "", "pl_PL.ISO-8859-2", "ISO-8859-2"},
+ {"", "", "", "US-ASCII"},
+--
+2.1.0
+
diff --git a/asciinema-man.patch b/asciinema-man.patch
new file mode 100644
index 0000000..5d65059
--- /dev/null
+++ b/asciinema-man.patch
@@ -0,0 +1,88 @@
+From 47aeff60105648451f257ed1942975b2b0ac93d5 Mon Sep 17 00:00:00 2001
+From: Jakub Jedelsky <jakub.jedelsky at gooddata.com>
+Date: Mon, 23 Mar 2015 16:15:52 +0100
+Subject: [PATCH] Man page should correspond to current commands
+
+Edit some details and add info for play and upload commands.
+---
+ man/asciinema.1 | 35 ++++++++++++++++++++++-------------
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/man/asciinema.1 b/man/asciinema.1
+index 17a5a47..a1cb102 100644
+--- a/man/asciinema.1
++++ b/man/asciinema.1
+@@ -3,7 +3,7 @@
+ asciinema \- Terminal recorder for asciinema.org service
+ .SH "SYNOPSIS"
+ .I asciinema
+-[\-h] [\-v] command [<args>]
++[\-h] [\-\-version] command [<args>]
+ .SH "DESCRIPTION"
+ Command line client (terminal recorder) for asciinema.org service.
+ .PP
+@@ -11,16 +11,12 @@ If you run
+ .I asciinema
+ with no arguments, help will be displayed showing all available commands.
+ .PP
+-In addition to this, you can run any asciinema command with the
+-.B -h
+-switch to display help about that specific command. For example, try running \fBasciinema rec -h\fP. This will display a list of all of the options \fBrec\fP command accepts, with their defaults.
+-.PP
+ .SH "OPTIONS"
+ .TP
+ \-h, \-\-help
+ Display help message
+ .TP
+-\-v, \-\-version
++\-\-version
+ Display version information
+ .SH "COMMANDS"
+ .B rec
+@@ -36,23 +32,36 @@ Recording finishes when you exit the shell (hit \fBCtrl+D\fP or type \fIexit\fP)
+ \fBASCIINEMA_REC=1\fP is added to recorded process environment variables. This can be used by your shell's config file (\fI.bashrc\fP, \fI.zshrc\fP) to alter the prompt or play a sound when shell is being recorded.
+ .RS 4
+ .TP
+-\-c
++\-c, \-\-command
+ command to record (if none given a new shell instance is recorded)
+ .TP
+-\-h, \-\-help
+-Display help message
+-.TP
+-\-\-max\-wait
++\-w, \-\-max\-wait
+ reduce recorded terminal inactivity to maximum of seconds (0 turns off)
+ .TP
+ \-t
+-set asciicast title (can be also set later, on the site)
++specify title of the asciicast
+ .TP
+-\-y
++\-y, \-\-yes
+ upload immediately after shell exits, without asking for confirmation
+ .RE
+ .RE
+ .PP
++.B play <filename>
++.RS 4
++Replay recorded asciicast in a terminal.
++.PP
++This command replays given asciicast (as recorded by \fIrec\fP command) directly in your terminal.
++.PP
++NOTE: it is recommended to run it in a terminal of dimensions not smaller than the one used for recording as there's no "transcoding" of control sequences for new terminal size.
++.RE
++.PP
++.B upload <filename>
++.RS 4
++Upload recorded asciicast to asciinema.org site.
++.PP
++This command uploads given asciicast (as recorded by \fIrec\fP command) to asciinema.org for further playback in a web browser.
++.RE
++.PP
+ .B auth
+ .RS 4
+ Assign local API token to asciinema.org account.
+--
+2.1.0
+
diff --git a/asciinema-use-upstream-packages.patch b/asciinema-use-upstream-packages.patch
new file mode 100644
index 0000000..8fa0f1b
--- /dev/null
+++ b/asciinema-use-upstream-packages.patch
@@ -0,0 +1,55 @@
+From 73e30528d361207d2ca4a3caa85987ff869b5cfb Mon Sep 17 00:00:00 2001
+From: Jakub Jedelsky <jakub.jedelsky at gooddata.com>
+Date: Wed, 18 Mar 2015 10:38:34 +0100
+Subject: [PATCH] Change dependencies to upstream packages
+
+---
+ main.go | 2 +-
+ terminal/terminal.go | 4 ++--
+ util/cfg.go | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/main.go b/main.go
+index d667f88..7e9ec40 100644
+--- a/main.go
++++ b/main.go
+@@ -6,7 +6,7 @@ import (
+ "strconv"
+ "strings"
+
+- "github.com/asciinema/asciinema/Godeps/_workspace/src/github.com/docopt/docopt-go"
++ "github.com/docopt/docopt-go"
+ "github.com/asciinema/asciinema/api"
+ "github.com/asciinema/asciinema/commands"
+ "github.com/asciinema/asciinema/util"
+diff --git a/terminal/terminal.go b/terminal/terminal.go
+index c3f913d..e95dc12 100644
+--- a/terminal/terminal.go
++++ b/terminal/terminal.go
+@@ -8,8 +8,8 @@ import (
+ "syscall"
+ "time"
+
+- "github.com/asciinema/asciinema/Godeps/_workspace/src/code.google.com/p/go.crypto/ssh/terminal"
+- "github.com/asciinema/asciinema/Godeps/_workspace/src/github.com/kr/pty"
++ "code.google.com/p/go.crypto/ssh/terminal"
++ "github.com/kr/pty"
+ "github.com/asciinema/asciinema/ptyx"
+ "github.com/asciinema/asciinema/util"
+ )
+diff --git a/util/cfg.go b/util/cfg.go
+index b81d0f7..39085bb 100644
+--- a/util/cfg.go
++++ b/util/cfg.go
+@@ -8,7 +8,7 @@ import (
+ "path"
+ "path/filepath"
+
+- "github.com/asciinema/asciinema/Godeps/_workspace/src/code.google.com/p/gcfg"
++ "code.google.com/p/gcfg"
+ )
+
+ const (
+--
+2.1.0
+
diff --git a/asciinema.spec b/asciinema.spec
index 0ec8595..e7620cc 100644
--- a/asciinema.spec
+++ b/asciinema.spec
@@ -2,28 +2,32 @@
%global provider github
%global provider_tld com
%global pkgname asciinema
-%global project %{pkgname}-cli
-%global import_path %{provider}.%{provider_tld}/%{pkgname}/%{project}
+%global import_path %{provider}.%{provider_tld}/%{pkgname}/%{pkgname}
-%global commit b68b7e6333e971fc1960c647b4ccfb451ca7f39c
+%global commit 062ba8aee02f60d847c3d230ff45da94e917fc7a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{pkgname}
-Version: 0.9.9
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 2%{?dist}
Summary: Command line client (terminal recorder) for asciinema.org service
Group: Applications/Internet
License: GPLv3
URL: http://asciinema.org
-Source0: https://github.com/%{pkgname}/%{project}/archive/v%{version}.tar.gz
+Source0: https://github.com/%{pkgname}/%{pkgname}/archive/v%{version}.tar.gz
Source1: asciinema.1
+Patch0: asciinema-use-upstream-packages.patch
+Patch1: asciinema-locale.patch
+Patch2: asciinema-man.patch
+
BuildRequires: golang
BuildRequires: golang-src
BuildRequires: gcc
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.crypto/ssh/terminal)
+BuildRequires: golang(github.com/docopt/docopt-go)
BuildRequires: golang(code.google.com/p/gcfg)
BuildRequires: python
Requires: glibc
@@ -39,15 +43,17 @@ BuildRequires: golang >= 1.2.1-3
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.crypto/ssh/terminal)
BuildRequires: golang(code.google.com/p/gcfg)
+BuildRequires: golang(github.com/docopt/docopt-go)
Requires: golang >= 1.2.1-3
Requires: golang(github.com/kr/pty)
Requires: golang(code.google.com/p/go.crypto/ssh/terminal)
Requires: golang(code.google.com/p/gcfg)
+Requires: golang(github.com/docopt/docopt-go)
Summary: A golang registry for global request variables (source libraries)
Provides: %{pkgname}-devel = %{version}-%{release}
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
-Provides: golang(%{import_path}/cli) = %{version}-%{release}
+Provides: golang(%{import_path}/asciicast) = %{version}-%{release}
Provides: golang(%{import_path}/commands) = %{version}-%{release}
Provides: golang(%{import_path}/ptyx) = %{version}-%{release}
Provides: golang(%{import_path}/terminal) = %{version}-%{release}
@@ -57,12 +63,14 @@ Provides: golang(%{import_path}/util) = %{version}-%{release}
%description devel
%{summary}
-This package provides the source libraries for asciinema(-cli).
+This package provides the source libraries for asciinema.
%prep
%setup -q -n %{pkgname}-%{version}
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
# set up temporary build gopath, and put our directory there
@@ -70,47 +78,52 @@ mkdir -p ./_build/src/%{import_path}
ln -s $(pwd)/* ./_build/src/%{import_path}/
export GOPATH=$(pwd)/_build:%{gopath}
-go build -o "bin/%{project}" -ldflags "-X main.GitCommit %{shortcommit} -s -linkmode external"
+go build -o "bin/%{pkgname}" -ldflags "-X main.GitCommit %{shortcommit} -s -linkmode external"
%install
# binary
install -d %{buildroot}%{_bindir}
-install -p -m 755 bin/%{project} %{buildroot}%{_bindir}/%{project}
-pushd %{buildroot}%{_bindir}
-ln -s %{project} %{pkgname}
-popd
+install -p -m 755 bin/%{pkgname} %{buildroot}%{_bindir}/%{pkgname}
# man page
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
+install -p -m 644 man/asciinema.1 %{buildroot}%{_mandir}/man1/
# devel
install -d -p %{buildroot}%{gopath}/src/%{import_path}
-for dir in api cli commands ptyx terminal util ;do
+for dir in api asciicast commands ptyx terminal util ;do
cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/
done
%check
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/asciicast
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/terminal
GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/commands
-GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/cli
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/util
%files
%doc CHANGELOG.md LICENSE README.md
-%{_bindir}/asciinema-cli
%{_bindir}/asciinema
%{_mandir}/man1/*
%files devel
-%doc CHANGELOG.md LICENSE README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{pkgname}/%{project}
+%doc CHANGELOG.md LICENSE README.md Godeps/Godeps.json
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{pkgname}/%{pkgname}
%{gopath}/src/%{import_path}
%changelog
+* Mon Mar 23 2015 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 1.0.0-2
+- Patch: support locale which ends with utf8
+- Patch: edit some details in man page
+
+* Tue Mar 17 2015 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 1.0.0-1
+- Update to new version
+- Add Godeps to docs
+
* Fri Mar 6 2015 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.9-1
- Update to new version
- Rewritten to Go
diff --git a/sources b/sources
index 5fe2d21..bf46b95 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f6a22f20100a616b6a98fc083f78a421 asciinema.1
-de31c3105c5447a6a2b27da6283affd9 v0.9.9.tar.gz
+82d08c97d8e15a9f7c9a114af8553356 v1.0.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/asciinema.git/commit/?h=f22&id=736813ecacf4cb99dcc05023859a74fddf678542
More information about the scm-commits
mailing list