Merge lp:~tyler-baker/lava-dashboard/lava-tool-update into lp:lava-dashboard

Proposed by Tyler Baker
Status: Merged
Merged at revision: 419
Proposed branch: lp:~tyler-baker/lava-dashboard/lava-tool-update
Merge into: lp:lava-dashboard
Diff against target: 65 lines (+8/-8)
3 files modified
dashboard_app/templates/dashboard_app/bundle_detail.html (+2/-2)
dashboard_app/templates/dashboard_app/data_view_list.html (+2/-2)
setup-dev-env.sh (+4/-4)
To merge this branch: bzr merge lp:~tyler-baker/lava-dashboard/lava-tool-update
Reviewer Review Type Date Requested Status
Antonio Terceiro Approve
Review via email: mp+183927@code.launchpad.net

Description of the change

Replace all instances of lava-dashboard-tool with lava-tool. It's confusing to reference deprecated tools, so lets update the text.

To post a comment you must log in.
Revision history for this message
Antonio Terceiro (terceiro) wrote :

LGTM

 review approve

review: Approve
Revision history for this message
Tyler Baker (tyler-baker) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dashboard_app/templates/dashboard_app/bundle_detail.html'
--- dashboard_app/templates/dashboard_app/bundle_detail.html 2013-02-25 04:52:22 +0000
+++ dashboard_app/templates/dashboard_app/bundle_detail.html 2013-09-04 16:45:37 +0000
@@ -59,9 +59,9 @@
59<p>You can download this bundle with the following command:</p>59<p>You can download this bundle with the following command:</p>
60<div class="console">60<div class="console">
61{% if bundle.private %}61{% if bundle.private %}
62 <code>lava-dashboard-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>62 <code>lava-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
63{% else %}63{% else %}
64 <code>lava-dashboard-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>64 <code>lava-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
65{% endif %}65{% endif %}
66</div>66</div>
67{% endblock %}67{% endblock %}
6868
=== modified file 'dashboard_app/templates/dashboard_app/data_view_list.html'
--- dashboard_app/templates/dashboard_app/data_view_list.html 2011-07-22 00:17:19 +0000
+++ dashboard_app/templates/dashboard_app/data_view_list.html 2013-09-04 16:45:37 +0000
@@ -9,8 +9,8 @@
9 class="ui-icon ui-icon-info"9 class="ui-icon ui-icon-info"
10 style="float: left; margin-right: 0.3em;"></span>10 style="float: left; margin-right: 0.3em;"></span>
11 <strong>Hint:</strong> To call a data view use the11 <strong>Hint:</strong> To call a data view use the
12 <code>lava-dashboard-tool</code> command. See 12 <code>lava-tool</code> command. See
13 <code>lava-dashboard-tool query-data-view --help</code>13 <code>lava-tool query-data-view --help</code>
14 to get started.14 to get started.
15 </div>15 </div>
16</div>16</div>
1717
=== modified file 'setup-dev-env.sh'
--- setup-dev-env.sh 2011-09-30 23:45:49 +0000
+++ setup-dev-env.sh 2013-09-04 16:45:37 +0000
@@ -11,7 +11,7 @@
11 PORT=800011 PORT=8000
12 fi12 fi
13fi13fi
14# Setup dashboard URL for lava-dashboard-tool14# Setup dashboard URL for lava-tool
15export DASHBOARD_URL=http://localhost:$PORT/dashboard15export DASHBOARD_URL=http://localhost:$PORT/dashboard
16# Find root directory16# Find root directory
17ROOT="$(bzr root)"17ROOT="$(bzr root)"
@@ -69,18 +69,18 @@
69 echo " * waiting for server to start up"69 echo " * waiting for server to start up"
70 sleep 570 sleep 5
71 echo " * creating bundle stream for example data" 71 echo " * creating bundle stream for example data"
72 lava-dashboard-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"72 lava-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"
73 for BUNDLE_PATHNAME in $ROOT/examples/bundles/*.json; do73 for BUNDLE_PATHNAME in $ROOT/examples/bundles/*.json; do
74 BUNDLE=$(basename $BUNDLE_PATHNAME .json)74 BUNDLE=$(basename $BUNDLE_PATHNAME .json)
75 echo " * importing bundle: $BUNDLE"75 echo " * importing bundle: $BUNDLE"
76 lava-dashboard-tool put $BUNDLE_PATHNAME >/dev/null76 lava-tool put $BUNDLE_PATHNAME >/dev/null
77 done77 done
78 for BUNDLE_PATHNAME in $ROOT/examples/bundles/templates/*.json; do78 for BUNDLE_PATHNAME in $ROOT/examples/bundles/templates/*.json; do
79 BUNDLE=$(basename $BUNDLE_PATHNAME .json)79 BUNDLE=$(basename $BUNDLE_PATHNAME .json)
80 echo " * importing bundle template: $BUNDLE"80 echo " * importing bundle template: $BUNDLE"
81 for i in $(seq 1 20); do81 for i in $(seq 1 20); do
82 sed "$BUNDLE_PATHNAME" -e "s!@TEMPLATE@!$(printf %04d $i)!g" > "$i-$BUNDLE"82 sed "$BUNDLE_PATHNAME" -e "s!@TEMPLATE@!$(printf %04d $i)!g" > "$i-$BUNDLE"
83 lava-dashboard-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null83 lava-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null
84 rm -f "$i-$BUNDLE"84 rm -f "$i-$BUNDLE"
85 done85 done
86 done86 done

Subscribers

People subscribed via source and target branches